summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Add comment with diff to DiffPositionUpdateService specnew-diff-notesDouwe Maan2016-07-071-0/+104
|
* Make `DiffNote#update_position` privateDouwe Maan2016-07-071-39/+44
|
* Update test with new factory nameDouwe Maan2016-07-071-2/+2
|
* Add send_git_patch helperDouwe Maan2016-07-061-1/+1
|
* Add tests for MergeRequest#reload_diffDouwe Maan2016-07-061-0/+40
|
* Add tests for DiffNoteDouwe Maan2016-07-061-0/+186
|
* Add tests for DiffPositionUpdateServiceDouwe Maan2016-07-061-0/+71
|
* Add tests for PositionDouwe Maan2016-07-061-0/+341
|
* Add tests for PositionTracerDouwe Maan2016-07-061-0/+1758
|
* Display new diff notes and allow creation through the web interfaceDouwe Maan2016-07-062-6/+504
|
* Add DiffNote modelDouwe Maan2016-07-064-18/+43
|
* Add Gitlab::Diff::LineMapperDouwe Maan2016-07-061-0/+137
|
* Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-065-9/+8
|
* Rename MergeRequest methods that return commits or shas to be more clear and ↵Douwe Maan2016-07-0611-34/+35
| | | | consistent
* Merge branch '18283-pluralize-stage-headings' into 'master' Jacob Schatz2016-07-061-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of pluralize on stage names ## What does this MR do? Removes `pluralize` from stage names ## What are the relevant issue numbers? Closes #18283 Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-06_at_11.11.39_AM](/uploads/b1b2dd00dc8aacc6dff40cab1fe1ecdd/Screen_Shot_2016-07-06_at_11.11.39_AM.png) cc @ayufan See merge request !5117
| * Remove plural from pipelines_spec18283-pluralize-stage-headingsAnnabel Dunstone2016-07-061-1/+1
| |
* | Merge branch 'gh-pull-requests' into 'master' Rémy Coutable2016-07-062-14/+23
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix importer for GitHub Pull Requests when a branch was reused across Pull Requests Closes #17766 ## What does this MR do? GitHub importer fails when a repository has two Pull Requests, with the same branch name and different SHA, one of which was closed without merging, and one which is open or was merged in. This happens because we only checks if the branch exists in the [Gitlab::GithubImport::BranchFormatter#exists?](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/gitlab/github_import/branch_formatter.rb#L6-8), before creating the missing references on Github. With this MR we check if both branch, and SHA exists in the current project. If no, we create the missing reference on GitHub before import the PR. ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? Github importer will fail if branch was reused across Pull Requests. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/19439 /cc @royaldark @thomasjachmann See merge request !5103
| * | Consider that a GH exists only if both `ref`, and `sha` existDouglas Barbosa Alexandre2016-07-062-14/+23
| |/
* | Merge branch 'remove-lowercase-gitlab-ci-yml' into 'master' Robert Speicher2016-07-061-3/+3
|\ \ | |/ |/| | | | | Remove duplicate templates that are lowercase See merge request !5114
| * Fix specsRémy Coutable2016-07-061-3/+3
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '19092-fix-event-for-legacydiffnote-not-considered-note' into ↵Douwe Maan2016-07-061-1/+31
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix diff comments not showing up in activity feed ## What does this MR do? It fixes the detection of note events to check for `Note` and `LegacyDiffNote`. ## Are there points in the code the reviewer needs to double check? No? /cc @DouweM (since I believe you introduced `LegacyDiffNote` ## Why was this MR needed? To fix #19092. ## What are the relevant issue numbers? Fixes #19092. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 !5069
| * | Use a more future-proof check for Note/LegacyDiffNote19092-fix-event-for-legacydiffnote-not-considered-noteRémy Coutable2016-07-061-4/+4
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Fix diff comments not showing up in activity feedRémy Coutable2016-07-041-1/+31
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'gh-labels' into 'master' Robert Speicher2016-07-065-39/+100
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow `?`, or `&` for label names Closes #18727 See merge request !4724
| * | | Move `unescape_html_entities` from LabelsHelper to Label modelDouglas Barbosa Alexandre2016-07-051-6/+0
| | | |
| * | | Render references for labels that name contains ?, or &Douglas Barbosa Alexandre2016-07-052-0/+56
| | | |
| * | | Allow '?', or '&' for label titlesDouglas Barbosa Alexandre2016-07-054-39/+50
| | |/ | |/|
* | | Merge branch 'fix/import-url-validator' into 'master' Robert Speicher2016-07-061-0/+12
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fixing URL validation for import_url on projects Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17536 This MR fixes problems related to bypassing `import_url` validation on projects. This makes sure the URL is properly validated so we don't enter crap and fail while running workers that handle this URL. It also adds a migration to fix current invalid `import_url`s See merge request !4753
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-06-3030-127/+551
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | fix/import-url-validator # Conflicts: # spec/models/project_spec.rb
| * \ \ fix merge conflictsJames Lopez2016-06-28109-1044/+2342
| |\ \ \
| * | | | another fix and fixed specJames Lopez2016-06-221-1/+8
| | | | |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-06-2241-566/+987
| |\ \ \ \ | | | | | | | | | | | | | | | | | | fix/import-url-validator
| * \ \ \ \ Merge branches 'fix/import-url-validator' and 'master' of ↵James Lopez2016-06-2065-224/+7472
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into fix/import-url-validator
| * | | | | | fixing URL validation for import_url on projectsJames Lopez2016-06-171-0/+5
| | | | | | |
* | | | | | | Revert back to not defining a default Git access protocol.Patricio Cano2016-07-051-1/+1
| | | | | | |
* | | | | | | Default Git access protocol to `web`Patricio Cano2016-07-051-1/+1
| | | | | | |
* | | | | | | Rename `enabled_git_access_protocols` to singular.Patricio Cano2016-07-053-6/+6
| | | | | | |
* | | | | | | Add more tests to the allowed protocols featurePatricio Cano2016-07-052-5/+103
| | | | | | |
* | | | | | | Rename ENV['PROTOCOL'] to ENV['GL_PROTOCOL'] to conform to what GitLab Shell ↵Patricio Cano2016-07-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | expects and make the `protocol` param in `GitAccess` mandatory.
* | | | | | | Add setting that allows admins to choose which Git access protocols are enabledPatricio Cano2016-07-051-0/+66
| | | | | | |
* | | | | | | Merge branch '18790-dont-show-request-button-to-project-owner' into 'master' Robert Speicher2016-07-055-69/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show "request access" button to project owners This MR fixes an issue where project owners that are not in the project's members list (I believe this is how we handled project owners before, now we seem to create a "Master" member for the project creator) would see the `Request Access` button. This MR fixes this issue in a clean way by adding a new `:request_access` ability to replace an ugly helper. It also give project owners the ability to update & destroy a requester that would happen to be themselves (since owners could request access to their own project before this MR). Related to #18790. See merge request !5091
| * | | | | | | New :request_access ability to replace a ugly helperRémy Coutable2016-07-055-69/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Group / project members cannot request access - Group members cannot request access to a group's project This addresses an issue where project owners could request access to their own project, leading to UI inconsistency where their requester status would replace their owner status. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Set user data in profile link in the headerDmitriy Zaporozhets2016-07-051-6/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | RailsCache metrics now includes fetch_hit/fetch_miss and read_hit/read_miss ↵Paco Guzman2016-07-051-0/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | info.
* | | | | | | Merge branch 'refactor/ci-config-move-global-entries' into 'master' Rémy Coutable2016-07-0517-136/+657
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move global ci entries handling from legacy to new config ## What does this MR do? This MR moves responsibility of handling global CI config entries (like `image`, `services`), from legacy `GitlabCiYamlProcessor` to new CI Config ## Why was this MR needed? This is the next iteration of CI configuration refactoring ## What are the relevant issue numbers? #15060 ## Does this MR meet the acceptance criteria? - 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) See merge request !4820
| * | | | | | | Add minor improvements in readability in CI configrefactor/ci-config-move-global-entriesGrzegorz Bizon2016-07-043-4/+3
| | | | | | | |
| * | | | | | | Improve description of CI types node and in specsGrzegorz Bizon2016-06-301-2/+2
| | | | | | | |
| * | | | | | | Add global cache config entry to new CI configGrzegorz Bizon2016-06-2911-30/+45
| | | | | | | |
| * | | | | | | Add CI config entry location info to error messageGrzegorz Bizon2016-06-292-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CI config entry location in configuration Hash.
| * | | | | | | Make it possible to set parent in CI config nodeGrzegorz Bizon2016-06-291-2/+14
| | | | | | | |
View Lorry Controller Status