- 21 Jul, 2016 4 commits
-
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
-
Achilleas Pipinellis authored
-
- 20 Jul, 2016 36 commits
-
-
Lin Jen-Shin authored
* master: (261 commits) Add link to user profile to commit avatar (!5163) Refactor service settings view Fix a problem with processing a pipeline where stage only has manual actions A CHANGELOG entry Don't show other actions of the same name Use limit parameter rather than hardcoded value Remove icons from explore nav Change how we style redirect_to Use flash[:notice] only Create PipelinesSettingsController for showing settings page Fix a few nitpicks Allow to disable user request access to groups/projects Enable Style/MultilineTernaryOperator rubocop cop Fix review comments Update routes Update CHANGELOG Improve implementation of variables Log cron_jobs configuration instead of raising exception Added checks for migration downtime Ensure to_json methods take optional argument ...
-
Rémy Coutable authored
Add link to profile to commit avatar ## What does this MR do? - links to user profiles to the avatars on commits page - tooltips to the avatars on commits page side effect: - links to user profiles to the avatars on pipelines page - tooltips to the avatars on pipelines page - tooltips to the avatars on activity page - mailto links to the avatars on activity page for non-registered users ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? There were no links nor Zeldas. ## What are the relevant issue numbers? fixes #19644 See merge request !5163
-
Lin Jen-Shin authored
This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' Oh well.
-
Robert Speicher authored
Added checks for migration downtime This adds a set of checks that check/list which migrations require downtime (or not). It also comes with a CI task that fails should a migration not be tagged properly. Fixes #14545 See merge request !4911
-
Robert Speicher authored
Enable Style/MultilineTernaryOperator rubocop cop Avoid multi-line ?: (the ternary operator). Use if/unless instead. See #17478 See merge request !4356
-
Rémy Coutable authored
Allow slack service to send messages on different channels closes #8110 ## Allow slack service to send messages on different channels ![new_slack_service](/uploads/87de0bd6b02a4f7853358676b5e74dff/new_slack_service.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5124
-
winniehell authored
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
-
Rémy Coutable authored
Fix two small problems on how we handle manual actions ## What does this MR do? Fixes two small problems in how we handle manual actions: - On environments page we show a `Play` for the same action that is lately deployed, we should show other actions only - When we process a pipeline that have only a manual action in a stage, the pipeline will stop being processed. - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5366
-
Rémy Coutable authored
Resolve "gitlab:setup rake task fails on 8.8.1 source install" _Originally opened at !4788 by @rickettm._ - - - ## What does this MR do? Fix bug #15344, so that the limit parameter that is already passed in to the print_users function is actually used, rather than using a hardcoded value. ## Are there points in the code the reviewer needs to double check? No, it is a trivial change. ## Why was this MR needed? This bug causes 100 LDAP users to be displayed even when a different limit is given, which can be annoying. ## What are the relevant issue numbers? Fixes #15344. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5364
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
-
Felipe Artur authored
-
Kamil Trzcinski authored
-
Jacob Schatz authored
Remove icons from explore nav ## What does this MR do? Removes icons from explore `nav/_explore` ## Why was this MR needed? To match signed-in nav ## Screenshots (if relevant) Before: ![Screen_Shot_2016-07-20_at_6.39.01_AM](/uploads/9ccc11d151e37a0ef2fab681ccc07efa/Screen_Shot_2016-07-20_at_6.39.01_AM.png) After: ![Screen_Shot_2016-07-20_at_6.43.15_AM](/uploads/ae058b19cc3c887bccf6c221ac58cfc2/Screen_Shot_2016-07-20_at_6.43.15_AM.png) See merge request !5362
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Kamil Trzcinski authored
-
M. Ricketts authored
-
Jacob Schatz authored
Apply diff view cookie on compare ## What does this MR do? Correctly respects the code view changing when comparing 2 refs. ## What are the relevant issue numbers? Closes #19573 ## Screenshots (if relevant) ![Screen_Shot_2016-07-07_at_12.38.07](/uploads/b6da78cc2bbc2c79dbe8292037176c1a/Screen_Shot_2016-07-07_at_12.38.07.png) ![Screen_Shot_2016-07-07_at_12.38.17](/uploads/977f8b697c65bdb1701db11a39287ac6/Screen_Shot_2016-07-07_at_12.38.17.png) See merge request !5135
-
Lin Jen-Shin authored
-
Rémy Coutable authored
Resolve "Move Build badges settings to Builds page (or Builds settings)" ## What does this MR do? Removes pipeline settings section from project settings & creates a new pipelines settings page Adds builds badge to pipelines settings page & removes badge page ## Are there points in the code the reviewer needs to double check? All Rails updates -> particularly `builds_controller.rb` and `routes` Spacing needs to be updated across all settings pages and will be in a separate MR (https://gitlab.com/gitlab-org/gitlab-ce/issues/19827) ## What are the relevant issue numbers? Closes #15343 Part of #18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-19_at_5.47.29_AM](/uploads/48e6d203de4cbe0b697280128695d980/Screen_Shot_2016-07-19_at_5.47.29_AM.png) ![Screen_Shot_2016-07-14_at_9.25.13_AM](/uploads/59118440f3e7bb903f44260abb119376/Screen_Shot_2016-07-14_at_9.25.13_AM.png) See merge request !5244
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
So we no longer join anything, just find the latest pipeline and load builds from there to avoid mixing builds. Thanks Kamil for the help and tests.
-
Annabel Dunstone authored
-
Jacob Schatz authored
Fix Issue 19641 (new snippets style bug) ## What does this MR do? Fixes Issue 19641 (new snippets style bug) ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Requested in issue 19641 by Fatih Acet https://gitlab.com/gitlab-org/gitlab-ce/issues/19641 ## What are the relevant issue numbers? 19641 ## Screenshots (if relevant) ![Screenshot_2016-07-09_13.25.39](/uploads/8ead7ea8f4aae7ccaa4d2ddc495b6fe3/Screenshot_2016-07-09_13.25.39.png) ## Does this MR meet the acceptance criteria? Yes - [ x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ NA] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ NA] API support added - Tests - [NA ] Added for this feature/bug - [ X] All builds are passing - [X ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5170
-
Rémy Coutable authored
Allow to disable user request access to groups/projects fixes #18585 ![projects](/uploads/9f381e77ffbcd2ecdbabdb8b201b95e4/projects.png) ![namespaces](/uploads/4b8d39c80576b499118373f0a221882c/namespaces.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5286
-