- 14 Nov, 2016 7 commits
-
-
Robert Speicher authored
Only turn on Sidekiq throttling if column exists If the database has not been migrated properly, the initializer for Sidekiq will fail to start and cause the whole Rails server to crash. This change checks the existence for the column and allows Rails to start even if the setting has not been added as a database column. Closes #24452 See merge request !7446
-
Robert Speicher authored
[ci skip]
-
Rémy Coutable authored
Centralized all LDAP config logic in to `Gitlab::LDAP::Config`. We had varying configuration for devise/omniauth and other things. For example, `user_filter` was never taken in to account for devise/omniauth so a user object would always be created, even if the user did not match the user_filter. Fixes gitlab-org/gitlab-ce#21195, https://gitlab.com/gitlab-org/gitlab-ce/issues/15396 and gitlab-org/gitlab-ce#13296 See merge request !6606
-
Robert Speicher authored
Remove unneeded nil checks See merge request !7437
-
Robert Speicher authored
Fix project Visibility level selector not using default values closes #20245 See merge request !7264
-
Rémy Coutable authored
Added ability to put emojis into repository name ## Are there points in the code the reviewer needs to double check? Ensure that regexp used is correct, I used the following list: http://www.unicode.org/Public/emoji/1.0/emoji-data.txt See merge request !7420
-
Sean McGivern authored
use single quote for consistency See merge request !7442
-
- 13 Nov, 2016 3 commits
-
-
Kamil Trzciński authored
Resolve "Link from build page to its pipeline" ## What does this MR do? Adds references and links to a build's pipeline within both individual build pages and the build index. ## Are there points in the code the reviewer needs to double check? Nothing springs to mind ## Why was this MR needed? See #22307 ## Screenshots (if relevant) ![Screen_Shot_2016-10-24_at_3.45.39_PM_copy](/uploads/e6e8745a0a39d8b71c007e7df5fbd051/Screen_Shot_2016-10-24_at_3.45.39_PM_copy.png) ![Screen_Shot_2016-10-24_at_3.46.03_PM_copy](/uploads/3e2eb656347751f10bf62891b56ebcc7/Screen_Shot_2016-10-24_at_3.46.03_PM_copy.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22307 See merge request !7082
-
Kamil Trzciński authored
Only run builds on master of CE or EE This should reduce builds run by projects still running all pipelines for CE See merge request !6869
-
Stan Hu authored
If the database has not been migrated properly, the initializer for Sidekiq will fail to start and cause the whole Rails server to crash. This change checks the existence for the column and allows Rails to start even if the setting has not been added as a database column. Closes #24452
-
- 12 Nov, 2016 15 commits
-
-
Achilleas Pipinellis authored
Fix link to index.md UX guide in development README.md Fix wrong link to UX docs that introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7142 See merge request !7444
-
Achilleas Pipinellis authored
[ci skip]
-
Ben Bodenmiller authored
-
Fatih Acet authored
Improvements to hover/active/focus states in header items ## What does this MR do? Adds some improvements to buttons, dropdowns, inputs, etc. in the header area. ## Are there points in the code the reviewer needs to double check? I'm not sure. ## Why was this MR needed? Requested in an issue. ## Screenshots (if relevant) ![caret](/uploads/574135282e4b2e81476fdd6dd6c1c05d/caret.gif)![hover](/uploads/15a3b8a2aa89baf20270be97c452e006/hover.gif) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24202 This is not complete yet. I'm new to this, so please let me know what all steps do I need to do (tests, changelog, etc.). See merge request !7412
-
Sean McGivern authored
Fix record not found error on NewNoteWorker processing Resolves #22678 See merge request !6863
-
Sean McGivern authored
fix Super User spacing See merge request !7433
-
Sean McGivern authored
update redis server details See merge request !7436
-
Z.J. van de Weg authored
-
Z.J. van de Weg authored
-
Z.J. van de Weg authored
The library we're using, default_value_for, is configured to interpret nil as the default value, being ENABLED. Given the property can't be nil this check is unneeded.
-
Devesh Khandelwal authored
-
Vincent Composieux authored
Added ability to put emojis into repository name
-
Ben Bodenmiller authored
-
Ben Bodenmiller authored
-
Oswaldo Ferreira authored
- Also remove unnecessary param
-
- 11 Nov, 2016 15 commits
-
-
Drew Blessing authored
Centralize all LDAP config logic in `GitLab::LDAP::Config`. Previously, some logic was in the Devise initializer and it was not honoring the `user_filter`. If a user outside the configured `user_filter` signed in, an account would be created but they would then be denied access. Now that logic is centralized, the filter is honored and users outside the filter are never created.
-
Stan Hu authored
Update 8.14-rc1 migrations to minimize downtime and deploy time ## What does this MR do? Modify 8.14-rc1 migrations and code to minimize downtime and deploy time ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? 8.14-rc1 migrations took too much time in staging, so we didn't want to take too much downtime in production ## Does this MR meet the acceptance criteria? - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24386 See merge request !7427
-
Sean McGivern authored
Ensure labels are loaded for all "show" methods of MR Controller Closes #24397 See merge request !7416
-
-
Douwe Maan authored
Allow certain Sidekiq jobs to be throttled ## What does this MR do? Allows certain slow running Sidekiq jobs to be throttled. It is disabled by default and can be enabled via the Application Settings. ![Screen_Shot_2016-11-04_at_4.51.24_PM](/uploads/a1f1d24c693fcdb278602765cd404d94/Screen_Shot_2016-11-04_at_4.51.24_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [x] All builds are passing ## What are the relevant issue numbers? Related to #23352 See merge request !7292
-
Fatih Acet authored
Migration to Vuejs version 2 List of required changes for our Vue usages - `init`
➡ `beforeCreate` - `read`➡ `mounted` - `$els`➡ `$refs` -🚫 `$remove` completely removed.✅ Use `indexOf` and `splice` -🚫 HTML embedding with `{{{ }}}` is deprecated.✅ Use `v-html` See merge request !7254 -
Alex Sanford authored
Previously, they were only being loaded on the actual `show` action, but not the actions representing the tabs (commits, builds, etc).
-
Achilleas Pipinellis authored
UX guide restructure The goal of this MR was to update the current UI guide to more of an UX guide (starting to detail when to use certain controls and patterns), and add structure to help organize the information. This initial version of the UX guide also lays down the groundwork for principles and personality. This guide is currently documenting the existing design, and will continue to be updated as the design evolves. Some inspiration/references used: - https://medium.com/ge-design/ges-predix-design-system-8236d47b0891#.nkf0chj8r - http://uxcellence.com/2015/11/04/product-principles/ - https://blog.asana.com/2013/10/design-principles/ See merge request !7142
-
Victor Wu authored
-
Achilleas Pipinellis authored
[ci skip]
-
Achilleas Pipinellis authored
-
Patricio Cano authored
-
Annabel Dunstone Gray authored
19205 Redesign group page header to match new navigation ## What does this MR do? Redesigns group page to match comps ## Screenshots (if relevant) Before: ![Screen_Shot_2016-11-08_at_12.50.53_PM](/uploads/6c958e2ab05c1a73c9a96de25490ba2b/Screen_Shot_2016-11-08_at_12.50.53_PM.png) After: ![Screen_Shot_2016-11-08_at_12.50.34_PM](/uploads/822f81df8a0f82a4bdeee3739be5d1f7/Screen_Shot_2016-11-08_at_12.50.34_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #19205 See merge request !7363
-
Fatih Acet authored
Remove project_title additions from builds and environments ## What does this MR do? Removed soon-to-be un-needed project title additions from builds and environments. **This MR depends on !5998, which introduces subnav to these pages. Without it we're just removing a useful link.** ## Are there points in the code the reviewer needs to double check? @iamphill Is this right of me? One of these still exists in `projects/artifacts/browse`, I'm not sure whether to fix the issue with `project_title`, which already has some issues with its chevron, or just remove it as it will soon be redundant. ## Why was this MR needed? ## Screenshots (if relevant) **BEFORE:** ![Screen_Shot_2016-10-27_at_14.58.22](/uploads/2915289fb06603c33d1abbcdab70c962/Screen_Shot_2016-10-27_at_14.58.22.png) **AFTER:** ![Screen_Shot_2016-10-27_at_14.58.29](/uploads/ad8574aeaa6771737bb9002d749b5559/Screen_Shot_2016-10-27_at_14.58.29.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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) ## What are the relevant issue numbers? Closes #21764 See merge request !6160
-
Fatih Acet authored
Account for fixed position MR when scrolling to elements ## What does this MR do? This MR accounts for the new merge request fixed affix bar when scrolling to an element on the MR page. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The fixed MR tabs bar was not being taken into account when shifting permalink scroll targets so that they are unobscured by navigation elements. ## Screenshots (if relevant) Issues discussion permalink: ![Screen_Shot_2016-10-26_at_12.29.26_AM](/uploads/e278f784252f2b79c466f56b4f36d198/Screen_Shot_2016-10-26_at_12.29.26_AM.png) Merge request discussion permalink: ![Screen_Shot_2016-10-26_at_12.28.26_AM](/uploads/1e57357fffb815b217484f09377f3c23/Screen_Shot_2016-10-26_at_12.28.26_AM.png) Merge request diff permalink: ![Screen_Shot_2016-10-26_at_12.29.02_AM](/uploads/269f3a4a4075932355f665322387db86/Screen_Shot_2016-10-26_at_12.29.02_AM.png) Commit diff page permalinks work as well, but aren't highlighted currently (see: #23696) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23520 See merge request !7051
-