Commits · ccf197aaade06f0b9afd6fba8c3cb182895deddd · nexedi / gitlab-ce

01 Jun, 2017 6 commits
- Fix mr squash feature test · ccf197aa
  Dmitriy Zaporozhets authored Jun 01, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ccf197aa
- Fix wrong constant name in etag router · 618fff55
  Dmitriy Zaporozhets authored Jun 01, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  618fff55
- Merge remote-tracking branch 'ee-com/master' into ce-to-ee · a6124a8b
  Dmitriy Zaporozhets authored Jun 01, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a6124a8b
- Merge branch 'mrchrisw-update-geo-docs' into 'master' · e530453d
  Achilleas Pipinellis authored Jun 01, 2017
```
Update source instructions for Geo. Add auto sync.

See merge request !1844
```
  e530453d
- Merge branch 'ee-issue-edit-inline' into 'master' · b73ff4f6
  Filipa Lacerda authored Jun 01, 2017
```
Port of issue-edit-inline to EE

See merge request !2010
```
  b73ff4f6
- Merge branch 'rename-builds-controller-ee' into 'master' · 848b2197
  Kamil Trzciński authored Jun 01, 2017
```
Rename builds controller for EE

See merge request !2008
```
  848b2197
31 May, 2017 28 commits
- Use #headers= instead of #header · 04e39db4
  Lin Jen-Shin authored Jun 01, 2017
```
I don't know why we need this change now?
```
  04e39db4
- Fix compain from scss-lint · 590b6365
  Dmitriy Zaporozhets authored May 31, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  590b6365
- Fix service hook after merge from CE · be8b43ea
  Dmitriy Zaporozhets authored May 31, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  be8b43ea
- Restore some changes in EE for the tests · 5863b5aa
  Lin Jen-Shin authored Jun 01, 2017
  
  5863b5aa
- Merge remote-tracking branch 'ee-com/master' into ce-to-ee · 0cbec8f2
  Dmitriy Zaporozhets authored May 31, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0cbec8f2
- Port of issue-edit-inline to EE · 4e46b1c8
  Phil Hughes authored May 31, 2017
  
  4e46b1c8
- Rename the partial from builds to jobs · 6c1dd46e
  Lin Jen-Shin authored May 31, 2017
  
  6c1dd46e
- Rename the other jobs · 6ca3ef3f
  Lin Jen-Shin authored May 31, 2017
  
  6ca3ef3f
- Fix Kubernetes service specs · 8a3d61ba
  Kamil Trzcinski authored May 31, 2017
  
  8a3d61ba
- Update jobs_spec for changes from builds_spec · 2056c255
  Lin Jen-Shin authored May 31, 2017
  
  2056c255
- Use another scope to add the - prefix, feedback: · 28dbb472
  Lin Jen-Shin authored May 31, 2017
```
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11407#note_30922591
```
  28dbb472
- Update changelog to reflect the new scheme · 32810903
  Lin Jen-Shin authored May 27, 2017
  
  32810903
- Should escape the routes because we added - · f471db03
  Lin Jen-Shin authored May 27, 2017
  
  f471db03
- Use - as the prefix so we don't conflict with namespaces · 2ce7b332
  Lin Jen-Shin authored May 26, 2017
```
The decision was made around:
https://gitlab.com/gitlab-org/gitlab-ce/issues/26407#note_30624641
```
  2ce7b332
- Routing helpers are no longer needed · 2cc1d427
  Lin Jen-Shin authored May 23, 2017
  
  2cc1d427
- Add checks before redirect, remove status/trace · fdaf4117
  Lin Jen-Shin authored May 23, 2017
```
compatible urls, which were for javascripts
```
  fdaf4117
- Use controllers to redirect · f07e1876
  Lin Jen-Shin authored May 23, 2017
  
  f07e1876
- Separate artifacts from builds, reusing artifacts_action_path · 41490904
  Lin Jen-Shin authored May 19, 2017
  
  41490904
- Complete all legacy builds URL. Tests are added · 948fc737
  Lin Jen-Shin authored May 19, 2017
  
  948fc737
- Use a single route, reducing duplication · 1b74e422
  Lin Jen-Shin authored May 18, 2017
  
  1b74e422
- Disable rubocop hash check for blocks · db87ca07
  Lin Jen-Shin authored May 18, 2017
  
  db87ca07
- Fix JS dispatcher for job trace · 4df56fc9
  Lin Jen-Shin authored May 18, 2017
  
  4df56fc9
- Add backward compatible routes for builds · c90a0c3c
  Lin Jen-Shin authored May 18, 2017
  
  c90a0c3c
- Add changelog entry · a37a0ae1
  Lin Jen-Shin authored May 18, 2017
  
  a37a0ae1
- Add migration to rename projects named jobs · 2b229572
  Lin Jen-Shin authored May 17, 2017
  
  2b229572
- Rename BuildsController to JobsController · 548d4b56
  Lin Jen-Shin authored May 16, 2017
```
Rename other URL generators

admin_builds_path -> admin_jobs_path

Fix tests and more renaming

Fix more tests

Also change build_id to job_id in the controller
```
  548d4b56
- Merge branch 'patch-1' into 'master' · cc3e7a47
  Achilleas Pipinellis authored May 31, 2017
```
Update kerberos.md to include a link to a Kerberos Explainer

See merge request !1753
```
  cc3e7a47
- Update kerberos.md to include a link to a Kerberos Explainer · 097ff07a
  Lee Matos authored May 31, 2017
  
  097ff07a
30 May, 2017 6 commits
- Merge branch 'sh-fix-issue-33011' into 'master' · a18607e4
  Robert Speicher authored May 30, 2017
```
Fix Error 500 when viewing a merge request with a deleted source project

Closes gitlab-ce#33011

See merge request !1996
```
  a18607e4
- Merge branch 'issue-boards-focus-mode-fix' into 'master' · e402a8c8
  Annabel Dunstone Gray authored May 30, 2017
```
Fixed header being over issue boards in focus mode

Closes #2473

See merge request !2002
```
  e402a8c8
- Fixed header being over issue boards in focus mode · 21edc7b0
  Phil Hughes authored May 30, 2017
```
Closes #2473
```
  21edc7b0
- Merge branch 'ee-31849-pipeline-show-view-realtime' into 'master' · 3820400b
  Phil Hughes authored May 30, 2017
```
Port of 31849-pipeline-show-view-realtime to EE

See merge request !1990
```
  3820400b
- Use function to define data instead of an object · 60e99239
  Filipa Lacerda authored May 30, 2017
  
  60e99239
- Fix another reference to git_reference_regex in config/routes · cecd2699
  Nick Thomas authored May 30, 2017
  
  cecd2699