summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Give 409 Conflict whenever the runner was already enabledprefer-assign_toLin Jen-Shin2016-06-141-1/+1
|
* Remove deprecated issues_tracker and issues_tracker_id from projectDouglas Barbosa Alexandre2016-06-133-41/+3
|
* Merge branch 'gitlab-auth-method-names' into 'master' Douwe Maan2016-06-132-14/+14
|\ | | | | | | | | | | | | | | | | | | Improve Gitlab::Auth method names Auth.find was a very generic name for a very specific method. Auth.find_in_gitlab_or_ldap was inaccurate in GitLab EE where it also looks in Kerberos. See merge request !4589
| * Also rename "find" in the specsJacob Vosmaer2016-06-131-5/+5
| |
| * Improve Gitlab::Auth method namesJacob Vosmaer2016-06-102-9/+9
| | | | | | | | | | | | Auth.find was a very generic name for a very specific method. Auth.find_in_gitlab_or_ldap was inaccurate in GitLab EE where it also looks in Kerberos.
* | Merge branch 'fix-bulk-assign-labels' into 'master' Jacob Schatz2016-06-131-0/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bulk-assign label for multiple issues not having the same labels ## What does this MR do? Fixes a bug when bulk-assigning a label to multiple issues while the label is present in on the issues on the selection. ## Screenshots (if relevant) **Before Bugfix** <img src="/uploads/ad1f290bcf3930177a3a71c69cbe5325/before-bugfix.gif" width="700"/> **After Bugfix** <img src="/uploads/1f04d6bf027806fb13ca3773febda744/bugfix.gif" width="700"/> ## Does this MR meet the acceptance criteria? - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) See merge request !4602
| * | Fixes a bug when assigning a label to multiple issuesfix-bulk-assign-labelsAlfredo Sumaran2016-06-101-0/+17
| | | | | | | | | | | | Fixes the case when we want to assign a label to multiple issues and one of the issues has already the label we want to apply.
* | | Merge remote-tracking branch 'origin/master' into artifacts-whenKamil Trzcinski2016-06-1348-193/+1200
|\ \ \
| * \ \ Merge branch 'fix-migration-helper-race-conditions' into 'master' Rémy Coutable2016-06-131-0/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix migration helper race conditions ## What does this MR do? This MR fixes two problems with the migration helpers: 1. An error in `change_column_null` would not drop the previously created column 2. `update_column_in_batches` would rely on the number of rows in a table to determine how many to update. This meant that newly inserted rows (after the `COUNT`) would not be taken into account. This MR also removes an outdated comment for `update_column_in_batches`. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? See above. ## What are the relevant issue numbers? Fixes #18483 ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4618
| | * | | Handle NULL migration errors in migration helpersYorick Peterse2016-06-131-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | This ensures that whenever changing the NULL constraint of a column fails we still drop the column.
| * | | | Merge branch '18377-cherry-pick-crashes-when-choosing-a-tag' into 'master' Rémy Coutable2016-06-131-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only show branches for revert / cherry-pick ## What does this MR do? Stop showing tags in the revert and cherry-pick select options. You can't change a tag anyway. ## Are there points in the code the reviewer needs to double check? Uncertain. ## Why was this MR needed? Showing tags doesn't make any sense and will just throw an exception if the user tries to cherry-pick or revert onto a tag. ## What are the relevant issue numbers? Fixes #18377. ## Screenshots (if relevant) On the GitLab CE repo: ![image](/uploads/9c5a6f09300a7c46d0a794bef2956992/image.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 - [x] Added for this feature/bug - [ ] 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 !4596
| | * | | | Only show branches for revert / cherry-pick18377-cherry-pick-crashes-when-choosing-a-tagSean McGivern2016-06-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tags are immutable, so we can't add a commit to either revert or cherry-pick another commit to them.
| * | | | | Merge branch 'issue_3359_2' into 'master' Douwe Maan2016-06-132-13/+289
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove notification level from user model part of #3359 See merge request !4494
| | * | | | Remove notification level fild from users, improve migrations and specsissue_3359_2Felipe Artur2016-06-101-3/+4
| | | | | |
| | * | | | Remove notification level from user modelFelipe Artur2016-06-102-11/+286
| | | | | |
| * | | | | Improved SVG sanitizer specs to include smoke tests for clean.bug/svg_sanitizerGabriel Mazetto2016-06-121-0/+16
| | | | | |
| * | | | | Refactored SVG sanitizerGabriel Mazetto2016-06-121-0/+18
| | | | | |
| * | | | | Refactor SVG sanitizer and prevent `xlink:href` to refer to external resourcesGabriel Mazetto2016-06-121-3/+15
| | | | | |
| * | | | | Fix SVG whitelisting to allow namespaced attributesGabriel Mazetto2016-06-121-0/+48
| | | | | |
| * | | | | Merge branch 'fix-closes-issues-error-500' into 'master' Robert Speicher2016-06-121-0/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when using closes_issues API with an external issue tracker Closes #18484 See merge request !4608
| | * | | | | Fix Error 500 when using closes_issues API with an external issue trackerStan Hu2016-06-111-0/+15
| | | |_|/ / | | |/| | | | | | | | | | | | | | | Closes #18484
| * | | | | Merge branch '18417-nav-offscreen' into 'master' Dmitriy Zaporozhets2016-06-111-3/+5
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Hide Left sidebar paradigm" ## What does this MR do? Hides the nav bar by default & centers the tanuki logo in the top nav ## Why was this MR needed? UX ## What are the relevant issue numbers? Closes #18417 ## Screenshots (if relevant) ![Screen_Shot_2016-06-10_at_12.49.10_PM](/uploads/c281e4c9de1c1bc9af59ebfa8d2bd18b/Screen_Shot_2016-06-10_at_12.49.10_PM.png) ![Screen_Shot_2016-06-10_at_12.49.27_PM](/uploads/635e0a88230105faa5527f6632899ddb/Screen_Shot_2016-06-10_at_12.49.27_PM.png) <img src="/uploads/3001a9c723037012f1b86cfacfb1225e/Screen_Shot_2016-06-10_at_12.51.41_PM.png" width="500px"> See merge request !4579
| | * | | | Fix preferences_spec test18417-nav-offscreenAnnabel Dunstone2016-06-101-3/+5
| | | | | |
| * | | | | Merge branch 'finding-multiple-projects-by-paths' into 'master' Robert Speicher2016-06-101-0/+33
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Project.where_paths_in In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4410 I'm working on reducing the SQL queries needed to render Markdown. One reason for the large amount of queries is executing a large number of queries needed to find projects and related data. Basically `Project.find_with_namespace` is called in a loop and then any relations have to be retrieved separately. By using `Project.where_paths_in` we can work around this by doing something like: ```ruby project_paths = [...] # populated by some method projects = Project.where_paths_in(project_paths).includes(:namespace, ...) ``` Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/18042 See merge request !4535
| | * | | | Add Project.where_paths_infinding-multiple-projects-by-pathsYorick Peterse2016-06-101-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method can be used to find multiple projects for multiple paths. For example, take this snippet: Project.where_paths_in(%w{gitlab-org/gitlab-ce gitlab-org/gitlab-ee}) This will return an ActiveRecord::Relation containing the GitLab CE and GitLab EE projects. This method takes care of matching rows both case-sensitively and case-insensitively where needed. Project.find_with_namespace in turn has been modified to use Project.where_paths_in without nuking any scoping (instead it uses reorder(nil)). This means that any default scopes (e.g. those used for "pending_delete" stay intact). The method Project.where_paths_in was added so the various Markdown filters can use a single query to grab all the projects referenced in a set of documents, something Project.find_with_namespace didn't allow.
| * | | | | Merge branch 'workhorse-helpers' into 'master' Robert Speicher2016-06-104-4/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add workhorse controller and API helpers Adds `send_git_blob` and `send_git_archive` controller and API helpers to reduce duplication and make Workhorse easier for a developer to work with. See merge request !4486
| | * \ \ \ \ Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-1032-341/+865
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Add send_git_diff helperDouwe Maan2016-06-0862-811/+2631
| | |\ \ \ \ \
| | * | | | | | Add workhorse controller and API helpersDouwe Maan2016-06-063-3/+6
| | | | | | | |
| * | | | | | | Merge branch 'ci-page-ui-update' into 'master' Jacob Schatz2016-06-101-16/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI build page UI update Closes #2569 See merge request !3829
| | * | | | | | | Updated testsci-page-ui-updatePhil Hughes2016-06-101-1/+1
| | | | | | | | |
| | * | | | | | | Fixed failing testsPhil Hughes2016-06-101-2/+4
| | | | | | | | |
| | * | | | | | | CI build page UI updatePhil Hughes2016-06-101-19/+8
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added sidebar Removed elements not present in design
| * | | | | | | Merge branch 'user-search-dropdown' into 'master' Jacob Schatz2016-06-101-36/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert change to search all users ## What does this MR do? Reverts a change that allowed the user to search for all users in the author/assignee dropdown ## Are there points in the code the reviewer needs to double check? Double check it isn't still searching all users See merge request !4564
| | * | | | | | | removed tests needed for any author :poop:user-search-dropdownPhil Hughes2016-06-101-36/+0
| | |/ / / / / /
| * | | | | | | Merge branch 'label-filter-fix' into 'master' Jacob Schatz2016-06-101-0/+15
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue where label filtering didnt work ## What does this MR do? The filterable option was missing which meant labels in the dropdown couldn't be filtered. This fixes that. ## What are the relevant issue numbers? Closes #18375 See merge request !4556
| | * | | | | | | Added testslabel-filter-fixPhil Hughes2016-06-091-0/+15
| | | | | | | | |
| * | | | | | | | Merge branch 'rename-ci-commit-phase-4' into 'master' Rémy Coutable2016-06-102-2/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Commit to Pipeline in TriggerRequest Changes in TriggerRequest a `commit` to `pipeline`. See merge request !4505
| | * | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-4Kamil Trzcinski2016-06-106-17/+171
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Rename commit to pipeline in TriggerRequestKamil Trzcinski2016-06-092-2/+2
| | | | | | | | |
| * | | | | | | | Fixing specs stubbed objects cannot access databasePaco Guzman2016-06-103-4/+4
| | | | | | | | |
| * | | | | | | | Cache the presence of an issue_tracker at project levelPaco Guzman2016-06-102-0/+96
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using update_column to store the boolean flag to avoid any side effects with the current state of the project instance
| * | | | | | | Rename ci_commit -> pipelineRémy Coutable2016-06-102-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to ↵Rémy Coutable2016-06-102-33/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #mergeable_ci_state? The logic of the method was obviously inverted. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Improve initial implementation of the ↵Rémy Coutable2016-06-103-64/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'only_allow_merge_if_build_succeeds.rb' feature Based on the feedback from reviewers. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Allow or not merge MR with failed buildRui Anderson2016-06-103-0/+230
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Fix failing `EmailOnPush` spec.Timothy Andrew2016-06-101-2/+2
| | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'award-emoji-fixes' into 'master' Jacob Schatz2016-06-091-7/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Award emoji fixes Fixes #18357 #18325 and #18424 See merge request !4550
| | * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-091-2/+28
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-091-1/+82
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |