summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'user_filter_auth' into 'master' Rémy Coutable2016-11-147-31/+150
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Centralize LDAP config/filter logicDrew Blessing2016-11-117-31/+150
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | Merge branch 'zj-remove-unneeded-checks' into 'master' Robert Speicher2016-11-141-6/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unneeded nil checks See merge request !7437
| * | | | | | | | | | Remove unneeded nil checkszj-remove-unneeded-checksZ.J. van de Weg2016-11-121-6/+0
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | Merge branch 'issue_20245' into 'master' Robert Speicher2016-11-143-1/+25
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project Visibility level selector not using default values closes #20245 See merge request !7264
| * | | | | | | | | | Fix project Visibility level selector not using default valuesissue_20245Felipe Artur2016-11-103-1/+25
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'repository-name-emojis' into 'master' Rémy Coutable2016-11-145-13/+30
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Added ability to put emojis into repository nameVincent Composieux2016-11-125-13/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added ability to put emojis into repository name
* | | | | | | | | | | Merge branch 'patch-12' into 'master' Sean McGivern2016-11-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use single quote for consistency See merge request !7442
| * | | | | | | | | | | use single quote for consistencyBen Bodenmiller2016-11-121-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '22307-pipeline-link-in-builds-view' into 'master' Kamil Trzciński2016-11-1311-12/+97
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | remove unused class name22307-pipeline-link-in-builds-viewMike Greiling2016-11-102-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | add tests for build row templatesMike Greiling2016-11-102-0/+56
| | | | | | | | | | | | |
| * | | | | | | | | | | | only display link to pipeline in generic build index, not on pipeline showMike Greiling2016-11-105-20/+22
| | | | | | | | | | | | |
| * | | | | | | | | | | | update generic commit status to correspond with build status templateMike Greiling2016-11-102-2/+11
| | | | | | | | | | | | |
| * | | | | | | | | | | | add missing column header for pipeline builds viewMike Greiling2016-11-102-3/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | remove red color on API pipeline trigger designationMike Greiling2016-11-101-4/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | add CHANGELOG entry for !7082Mike Greiling2016-11-101-0/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | add pipeline column within builds indexMike Greiling2016-11-102-0/+10
| | | | | | | | | | | | |
| * | | | | | | | | | | | add link to build's pipeline within build page headerMike Greiling2016-11-102-0/+7
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'zj-update-ci' into 'master' Kamil Trzciński2016-11-131-5/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | Also test on dev.gitlab [ci skip]zj-update-ciZ.J. van de Weg2016-11-121-1/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Only run builds on master of CE or EEZ.J. van de Weg2016-11-121-4/+6
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ux-guide-index' into 'master' Achilleas Pipinellis2016-11-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Fix link to index.md in development README.mdux-guide-indexAchilleas Pipinellis2016-11-121-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge branch '24202-header-ui-improvements' into 'master' Fatih Acet2016-11-122-0/+12
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Remove hover state on location badge.Devesh Khandelwal2016-11-121-6/+0
| | | | | | | | | | |
| * | | | | | | | | | Darken more icons on hover and highlight search form also.Devesh Khandelwal2016-11-112-0/+14
| | | | | | | | | | |
| * | | | | | | | | | Darken project selection dropdown caret on hover.Devesh Khandelwal2016-11-111-0/+4
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'new-note-worker-record-not-found-fix' into 'master' Sean McGivern2016-11-126-11/+99
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix record not found error on NewNoteWorker processing Resolves #22678 See merge request !6863
| * | | | | | | | | | Does not raise error when Note not found when processing NewNoteWorkerOswaldo Ferreira2016-11-116-11/+99
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also remove unnecessary param
* | | | | | | | | | Merge branch 'patch-8' into 'master' Sean McGivern2016-11-121-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix Super User spacing See merge request !7433
| * | | | | | | | | | fix Super User spacingBen Bodenmiller2016-11-121-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'patch-11' into 'master' Sean McGivern2016-11-121-5/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | update redis server details See merge request !7436
| * | | | | | | | | update redis server detailsBen Bodenmiller2016-11-121-5/+5
|/ / / / / / / / /
* | | | | | | | | Merge branch '24386-8-14-rc1-requires-quite-amount-of-downtime' into 'master' Stan Hu2016-11-115-5/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Update 8.14-rc1 migrations to minimize downtime and deploy timeAlejandro Rodríguez2016-11-115-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/24386
* | | | | | | | | | Merge branch '24397-load-labels-on-mr-tabs' into 'master' Sean McGivern2016-11-113-0/+30
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure labels are loaded for all "show" methods of MR Controller Closes #24397 See merge request !7416
| * | | | | | | | | Ensure labels are loaded on "show" methods of MRAlex Sanford2016-11-113-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, they were only being loaded on the actual `show` action, but not the actions representing the tabs (commits, builds, etc).
* | | | | | | | | | Merge branch 'sidekiq-job-throttling' into 'master' Douwe Maan2016-11-1116-1/+178
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Refactored Sidekiq Throttler and updated documentationsidekiq-job-throttlingPatricio Cano2016-11-116-23/+20
| | | | | | | | | | |
| * | | | | | | | | | Refactored initializer code to its own class and added testsPatricio Cano2016-11-103-7/+56
| | | | | | | | | | |
| * | | | | | | | | | Added documentation and CHANGELOG item.Patricio Cano2016-11-104-0/+37
| | | | | | | | | | |
| * | | | | | | | | | Allow the Sidekiq queues to throttle and the factor by which to throttle ↵Patricio Cano2016-11-108-13/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | them to be configurable
| * | | | | | | | | | Allow certain Sidekiq jobs to be throttledPatricio Cano2016-11-109-0/+66
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'vue2' into 'master' Fatih Acet2016-11-1141-9582/+7023
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migration to Vuejs version 2 List of required changes for our Vue usages - `init` :arrow_right: `beforeCreate` - `read` :arrow_right: `mounted` - `$els` :arrow_right: `$refs` - :no_entry_sign: `$remove` completely removed. :white_check_mark: Use `indexOf` and `splice` - :no_entry_sign: HTML embedding with `{{{ }}}` is deprecated. :white_check_mark: Use `v-html` See merge request !7254
| * | | | | | | | | | Fixed tests for issue boards & diff note resolvingvue2Phil Hughes2016-11-102-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Fix Merge Conflicts app to make it work with Vue 2Alfredo Sumaran2016-11-104-27/+17
| | | | | | | | | | |
| * | | | | | | | | | Changed how lists get sortedPhil Hughes2016-11-103-2/+6
| | | | | | | | | | |
| * | | | | | | | | | Issue board spec fixesPhil Hughes2016-11-103-2/+4
| | | | | | | | | | |