summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Refactor Issues::BulkUpdateService specrs-bulk-issues-update-specRobert Speicher2016-07-202-76/+65
| | | | | | | | - Create fewer Issue objects; 2 is as good as 5 for these cases. This gives us a nice little speed improvement. - Don't `describe` Symbols. - Simplify object creation. - Lessen "mystery guest" antipattern
* Merge branch '18586-user-authorized_projects-is-slow' into 'master' Yorick Peterse2016-07-206-0/+152
|\ | | | | | | | | Refactor user authorization check for a single project to avoid querying all user projects See merge request !5102
| * Refactor user authorization check for a single project to avoid querying all ↵Alejandro Rodríguez2016-07-206-0/+152
| | | | | | | | | | | | | | | | | | | | user projects Currently, even when searching for all authorized issues of *one* project, we run the `Users#authorized_projects` query (which can be rather slow). This update checks if we are handling issues of just one project and does the authorization check locally. It does have the downside of basically repeating the logic of `Users#authorized_projects` on `Project#authorized_for_user`.
* | Merge branch 'email-domain-blacklist' into 'master' Robert Speicher2016-07-2019-76/+318
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the ability to block sign ups using a domain blacklist. As part of this MR, I restructured the Application Settings form to separate **Sign up** related settings from **Sign in** related settings and make everything cleaner and easier to read. Fixes #19749 Related to #5573 See merge request !5259
| * | Reorder allowed params for `ApplicationSetting` and add more details to docs.email-domain-blacklistPatricio Cano2016-07-192-3/+9
| | |
| * | Removed escaping characters by using double quotes.Patricio Cano2016-07-181-1/+1
| | |
| * | Default to manual input for `domain_whitelist`, syntax fixes and added new ↵Patricio Cano2016-07-186-10/+19
| | | | | | | | | | | | tests.
| * | Refactor `match_domain` to a predicate: `domain_matches?`Patricio Cano2016-07-181-3/+3
| | |
| * | Refactor and rename `restricted_signup_domains` to `domain_whitelist` to ↵Patricio Cano2016-07-1813-55/+58
| | | | | | | | | | | | better conform to its behavior and newly introduced behavior.
| * | Move inline JS to admin.js.coffee specific file.Patricio Cano2016-07-181-0/+12
| | |
| * | Refactored the domain separator regex, plus syntax and grammar fixes.Patricio Cano2016-07-184-20/+19
| | |
| * | Make sure email domain validation method is private.Patricio Cano2016-07-181-28/+26
| | |
| * | Fixed `signup_domain_valid?` flow and added documentation.Patricio Cano2016-07-183-20/+39
| | |
| * | Added CHANGELOG item.Patricio Cano2016-07-181-0/+1
| | |
| * | Added the ability to block sign ups using a domain blacklist.Patricio Cano2016-07-1810-33/+228
| | |
* | | Merge branch 'faster-builds-ci' into 'master' Douwe Maan2016-07-201-7/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed improvement for builds without DB Only fetch the images which we are going to use. Speeds up the builds by about 30-45 seconds. /cc @ayufan See merge request !4994
| * | | Use YAML inheritance to DRY the .gitlab-ci.ymlfaster-builds-ciZ.J. van de Weg2016-07-201-19/+14
| | | |
| * | | Speed improvement for builds without DBZ.J. van de Weg2016-06-291-8/+34
| | | | | | | | | | | | | | | | | | | | | | | | Now the builds which do not use the DB or Redis won't pull the images from docker, and won't migrate the DB. This _should_ improve the build times slightly but also create a cleaner trace.
* | | | Merge branch 'cs-warn-on-failure' into 'master' Fatih Acet2016-07-209-10/+73
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warn on failure ## What does this MR do? Adds styling and HTML for a `success_with_warnings` status in the MR widget. Unfinished as it needs some plumbing in the relevant CI controllers and models. ## Are there points in the code the reviewer needs to double check? Not at the moment, though I think I'll probably need help getting this to work in the backend. ## What are the relevant issue numbers? #17669 ## Screenshots (if relevant) ![Screen_Shot_2016-06-29_at_12.02.49_PM](/uploads/af4a915689633fe028f44bb34ae7a5b1/Screen_Shot_2016-06-29_at_12.02.49_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] 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) cc: @ayufan See merge request !5004
| * \ \ \ Merge remote-tracking branch 'origin/master' into cs-warn-on-failurecs-warn-on-failureKamil Trzcinski2016-07-2033-105/+283
| |\ \ \ \
| * | | | | Use switch statements instead of if/else chains.Connor Shea2016-07-192-8/+10
| | | | | |
| * | | | | Address feedback.Connor Shea2016-07-193-11/+21
| | | | | |
| * | | | | Add with_warnings? method to Pipelines and add tests.Connor Shea2016-07-194-0/+35
| | | | | |
| * | | | | Starting work on the warn_on_failure feature for the MR build status.Connor Shea2016-07-195-5/+23
| | | | | |
* | | | | | Merge branch ↵Gabriel Mazetto2016-07-206-75/+159
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '14284-allow-all-deploy-keys-to-be-retrieved-via-api-regardless-of-project-affiliation' into 'master' Add /deploy_keys API to retrieve all deploy keys regardless of project affiliation ## What does this MR do? Add /deploy_keys API to retrieve all deploy keys regardless of project affiliation ## Are there points in the code the reviewer needs to double check? Is documentation clear? ## Why was this MR needed? User request ## What are the relevant issue numbers? #14284 See merge request !4426
| * | | | | | Change `return`s for `next`s to please rubocop (behaviour is the same)Alejandro Rodríguez2016-07-201-2/+2
| | | | | | |
| * | | | | | Add /deploy_keys API to retrieve all deploy keys regardless of project ↵Alejandro Rodríguez2016-07-206-75/+159
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | affiliation Also, in favour of consistency, deprecate `/projects/:id/keys/...` routes in favour of `/projects/:id/deploy_keys/...`
* | | | | | Merge branch 'fix-side-by-side-comment-widget' into 'master' Jacob Schatz2016-07-203-7/+103
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix side by side comment widget Fixes comment button for empty lines in side by side diff view. Fixes #19824 Fixes #19957 See merge request !5262
| * | | | | Added diff comments feature testfix-side-by-side-comment-widgetLuke "Jared" Bennett2016-07-191-0/+94
| | | | | |
| * | | | | Updated CHANGELOG.Fatih Acet2016-07-191-0/+1
| | | | | |
| * | | | | Off mouse listener from document for diff comment button.Fatih Acet2016-07-191-1/+3
| | | | | |
| * | | | | Fix inline view for comment button selector.Fatih Acet2016-07-191-1/+4
| | | | | |
| * | | | | Revert "Refactored .prev and .next methods"Fatih Acet2016-07-191-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ec37d9553274e3bca58e4de44b932cdc72a37325.
* | | | | | Merge branch 'add-link-to-commit-avatar' into 'master' Rémy Coutable2016-07-206-17/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Add link to user profile to commit avatar (!5163)winniehell2016-07-206-17/+35
| | | | | | |
* | | | | | | Merge branch 'migration-downtime-tags' into 'master' Robert Speicher2016-07-2010-24/+311
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Added checks for migration downtimemigration-downtime-tagsYorick Peterse2016-07-2010-24/+311
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These new checks can be used to check if migrations require downtime or not (as tagged by their authors). In CI this compares the current branch with master so migrations added by merge requests are automatically verified. To check the migrations added since a Git reference simply run: bundle exec rake gitlab:db:downtime_check[GIT_REF]
* | | | | | | | Merge branch 'rubocop/enable-multiline-ternary-operator-cop' into 'master' Robert Speicher2016-07-204-10/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/MultilineTernaryOperator rubocop cop Avoid multi-line ?: (the ternary operator). Use if/unless instead. See #17478 See merge request !4356
| * | | | | | | | Enable Style/MultilineTernaryOperator rubocop coprubocop/enable-multiline-ternary-operator-copGrzegorz Bizon2016-07-204-10/+15
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid multi-line ?: (the ternary operator). Use if/unless instead. See #17478
* | | | | | | | Merge branch 'issue_8110' into 'master' Rémy Coutable2016-07-2016-118/+276
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Refactor service settings viewissue_8110Felipe Artur2016-07-2015-138/+86
| | | | | | | |
| * | | | | | | Add project service documentation and update integration documentationFelipe Artur2016-07-1910-46/+78
| | | | | | | |
| * | | | | | | Allow slack service to send messages on different channelsFelipe Artur2016-07-1910-21/+199
| | | | | | | |
* | | | | | | | Merge branch 'fix-retries-on-manual-actions' into 'master' Rémy Coutable2016-07-204-14/+33
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Fix a problem with processing a pipeline where stage only has manual actionsfix-retries-on-manual-actionsKamil Trzcinski2016-07-202-13/+16
| | | | | | | | |
| * | | | | | | | Don't show other actions of the same nameKamil Trzcinski2016-07-202-1/+17
| | | | | | | | |
* | | | | | | | | Merge branch '17862-honour-limit-in-ldap-check' into 'master' Rémy Coutable2016-07-202-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | A CHANGELOG entryRémy Coutable2016-07-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | Use limit parameter rather than hardcoded valueM. Ricketts2016-07-201-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'explore-nav' into 'master' Jacob Schatz2016-07-201-4/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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