Commits · 22ce76d447407024d9bd58eedce6c166eb7b6eb2 · jt-gitlab / GitLab Community Edition · GitLab

Snippets Groups Projects

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

Aug 18, 2016
- Refactor to mark Changes tab as active on new MR page. · 22ce76d4
  Ruben Davila authored 8 years ago
  
  22ce76d4
- Fix tabs navigation and do not update URL via pushstate · 43252ccb
  Alfredo Sumaran authored 8 years ago
  
  43252ccb
Aug 12, 2016
- Use a regular flash message after resolution is complete · 83925ef4
  Douwe Maan authored 8 years ago
  
  83925ef4
- Prevent “This merge request contains merge conflicts” from being shown after... · 1711a384
  Douwe Maan authored 8 years ago
  1711a384
- Get conflict resolution to work for MRs from forks · 8dba8e2d
  Douwe Maan authored 8 years ago
  
  8dba8e2d
- Show appropriate message when conflicts have already been resolved · 5e1e08e5
  Douwe Maan authored 8 years ago
  
  5e1e08e5
- Verify user is signed in and can actually resolve conflicts · 9eca67c9
  Douwe Maan authored 8 years ago
  
  9eca67c9
- Rename `can_resolve_conflicts_in_ui?` to `conflicts_can_be_resolved_in_ui?` · cf4cbb01
  Douwe Maan authored 8 years ago
  
  cf4cbb01
- Add more tests for conflicts · ce7eb4e4
  Sean McGivern authored 8 years ago
  
  ce7eb4e4
- Set flash message after conflict is resolved · f322c302
  Sean McGivern authored 8 years ago
  
  f322c302
- Remove undo endpoint · 46f8e642
  Sean McGivern authored 8 years ago
  46f8e642
- Move resolving code to ResolveService · ba327e69
  Sean McGivern authored 8 years ago
  
  ba327e69
- Don't allow resolving invalid conflicts · 427e7246
  Sean McGivern authored 8 years ago
  427e7246
- Fix resolve_conflicts endpoint · 3cc07e7e
  Sean McGivern authored 8 years ago
  
  3cc07e7e
- Make SCSS lint and RuboCop happy · 76cd67b0
  Sean McGivern authored 8 years ago
  
  76cd67b0
- Render right sidebar and handle request error. · c2295fbd
  Fatih Acet authored 8 years ago
  
  c2295fbd
- Handle case where one side deleted the file · f3cf40b8
  Sean McGivern authored 8 years ago
  
  f3cf40b8
- Remove Conflicts tab make it a page instead. · 66ffa28e
  Fatih Acet authored 8 years ago
  
  66ffa28e
- REMOVE THIS COMMIT: allow undoing last resolution · 99e00856
  Sean McGivern authored 8 years ago
  
  99e00856
- Handle conflict resolution errors in controller · f2f84469
  Sean McGivern authored 8 years ago
  
  f2f84469
- Fix commit tab initial load · d7721635
  Sean McGivern authored 8 years ago
  
  d7721635
- Allow resolving conflicts in MR controller · 14a4b17d
  Sean McGivern authored 8 years ago
  
  14a4b17d
- Handle multiple merge conflict files in collection · a1c79612
  Sean McGivern authored 8 years ago
  
  a1c79612
- Add backend for merge conflicts reading · df2ed097
  Sean McGivern authored 8 years ago
  
  df2ed097
- Added routes for conflicts in merge requests page. · 907317c4
  Fatih Acet authored 8 years ago
  
  907317c4
- Properly select a list of Pipelines for a Merge Requests · cae0fa7c
  Kamil Trzcinski authored 8 years ago
  
  cae0fa7c
Aug 11, 2016
- Pre-create all builds for Pipeline when a trigger is received · 39203f1a
  Kamil Trzcinski authored 8 years ago
  39203f1a
- Fix merge request new view not changing code view rendering style · bbb01909
  Paco Guzman authored 8 years ago
  
  bbb01909
Aug 03, 2016
- switch from diff_file_collection to diffs · c86c1905
  Paco Guzman authored 8 years ago
  c86c1905
- Introduce Compare model in the codebase. · 1d0c7b74
  Paco Guzman authored 8 years ago
  1d0c7b74
- Move to Gitlab::Diff::FileCollection · 8f359ea9
  Paco Guzman authored 8 years ago
  8f359ea9
- Cache highlighted diff lines for merge requests · cd7c2cb6
  Paco Guzman authored 8 years ago
  cd7c2cb6
Aug 02, 2016
- Speedup DiffNote#active? on discussions, preloading noteables and avoid... · 8716ff7f
  Paco Guzman authored 8 years ago
  8716ff7f
Aug 01, 2016
- State specific default sort order for issuables · 84a3225b
  zs authored 8 years ago
  84a3225b
Jul 28, 2016
- Reduce number of queries made for merge_requests/:id/diffs · e4027e40
  Ahmad Sherif authored 8 years ago
  
  e4027e40
Jul 26, 2016
- Incorporate review comments · 871723da
  Stan Hu authored 8 years ago
  
  871723da
- Optimize maximum user access level lookup in loading of notes · d1ea2bca
  Stan Hu authored 8 years ago
  d1ea2bca
- Display all pipelines for Merge Request · 0d6d7f6e
  Annabel Dunstone authored 8 years ago
  
  0d6d7f6e
Jul 25, 2016
- Add route, controller action, and views for MR pipelines · db19e720
  Annabel Dunstone authored 8 years ago
  
  db19e720
Jul 20, 2016
- Add Discussion model to represent MR/diff discussion · 79214be7
  Douwe Maan authored 8 years ago
  
  79214be7