- 14 Jul, 2017 40 commits
-
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
* upstream/master: (41 commits) Update test description to reflect behaviour Revert "Merge branch 'revert-2c879643' into 'master'" Add changelog entry Instrument Ability Update tests to cover removal of inactive tokens table Remove inactive tokens table Fix spacing in sidebar Use shared protected tag views for CE-partials Use shared protected branches views for CE-partials Fixed typo Handle nil BroadcastMessage.current in the views Handle case when BroadcastMessage.current is nil Update the mysql2 gem to v0.4.5 Make sure MergeRequest commit methods work when either compare_commits or merge_request_diff is set Increase width of dropdown menus automatically up to 500 px Indirectly migrate count_commits_between to Gitaly More Gitaly annotations Add more notes about developer seeds missed one... Move find file URL out of global variable ...
-
Grzegorz Bizon authored
Remove the rest of `trigger_schedule` related codes Closes #32032 See merge request !12839
-
Filipa Lacerda authored
Remove Inactive Personal Access Tokens list from Access Tokens page Closes #19629 See merge request !12866
-
Grzegorz Bizon authored
Fix undefined method quote when database load balancing is used Closes gitlab-ce#35097 See merge request !2430
-
Grzegorz Bizon authored
Revert "Merge branch 'revert-2c879643' into 'master'" See merge request !12870
-
kushalpandya authored
-
Sean McGivern authored
Fix implicit license plans Closes #2929 See merge request !2427
-
Sean McGivern authored
This reverts merge request !12633
-
Sean McGivern authored
Update the mysql2 gem to v0.4.5 See merge request !12859
-
Yorick Peterse authored
Instrument Ability See merge request !12865
-
Dmitriy Zaporozhets authored
CE upstream: Thursday Closes gitlab-shell#92, gitaly#356, gitlab-ce#34853, and gitlab-ce#34941 See merge request !2422
-
Sean McGivern authored
Gitlab::Git shuffling and Gitaly annotations See merge request !12849
-
Nick Thomas authored
Licenses without a plan specified need to act as though they are EES. This is currently implemented for licenses that don't include a plan in their data at all, but if `plan: nil` or `plan: ""` is set, the customer loses access to a number of features with license checks added in 9.4. This commit changes the license check to use the starter plan in those cases too.
-
Filipa Lacerda authored
Add a license check for permissions to users/groups on protected refs Closes #2574 See merge request !2320
-
Sean McGivern authored
Extract partials from the protected_branches & protected_tags views See merge request !12864
-
Filipa Lacerda authored
Move find file URL out of global variable See merge request !12846
-
Lin Jen-Shin authored
-
kushalpandya authored
-
Lin Jen-Shin authored
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/35097
-
Sean McGivern authored
-
kushalpandya authored
-
kushalpandya authored
-
Dmitriy Zaporozhets authored
Document Code Quality limitation See merge request !2428
-
Sean McGivern authored
Fixes needed when GitLab sign-in is not enabled See merge request !12491
-
Phil Hughes authored
Fix spacing in sidebar Closes #35035 See merge request !12844
-
Filipa Lacerda authored
-
Bob Van Landuyt authored
So they are reusable for EE later
-
Bob Van Landuyt authored
-
Achilleas Pipinellis authored
Fixed typo See merge request !12862
-
Achilleas Pipinellis authored
-
Sean McGivern authored
Handle case when BroadcastMessage.current is nil Closes #35094 See merge request !12860
-
kamesh authored
-
Stan Hu authored
-
Stan Hu authored
Somehow Rails.cache.fetch occasionally returns `nil` values, which causes this endpoint to crash. Closes #35094
-
Stan Hu authored
Make sure MergeRequest commit methods work when either compare_commits or merge_request_diff is set Closes #35077 See merge request !12856
-
Nick Thomas authored
-
Douwe Maan authored
Merge request approvals before merge should be nil if unavailable Closes gitlab-ce#35082 See merge request !2426
-
Douwe Maan authored
-
Nick Thomas authored
-