summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add comment with diff to DiffPositionUpdateService specnew-diff-notesDouwe Maan2016-07-071-0/+104
|
* Use HAML class syntax in diff line partialsDouwe Maan2016-07-072-5/+5
|
* Make `DiffNote#update_position` privateDouwe Maan2016-07-072-58/+58
|
* Update test with new factory nameDouwe Maan2016-07-071-2/+2
|
* We can't call private methods with `self.`Douwe Maan2016-07-071-5/+5
|
* Remove duplication, unused methods, and some other style thingsDouwe Maan2016-07-066-18/+14
|
* Make methods private that don't need to be publicDouwe Maan2016-07-061-43/+47
|
* Add some more code comments.Douwe Maan2016-07-065-3/+20
|
* Use stored start and head for MR diff without whitespaceDouwe Maan2016-07-061-2/+2
|
* On MRs being imported, commits aren't available yetDouwe Maan2016-07-061-1/+1
|
* Keep around DiffNote position commitsDouwe Maan2016-07-061-0/+13
|
* Add send_git_patch helperDouwe Maan2016-07-064-11/+21
|
* 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
|
* Update schemaDouwe Maan2016-07-061-1/+7
|
* Display new diff notes and allow creation through the web interfaceDouwe Maan2016-07-0614-78/+622
|
* Allow reply-by-email with diff notesDouwe Maan2016-07-063-10/+51
|
* Automatically update diff note positions when MR is pushed toDouwe Maan2016-07-065-9/+94
|
* Support new diff notes on MRs with diff_refsDouwe Maan2016-07-064-1/+12
|
* Add DiffNote modelDouwe Maan2016-07-068-22/+155
|
* Add Gitlab::Git::PositionTracerDouwe Maan2016-07-061-0/+168
|
* Add Gitlab::Diff::LineMapperDouwe Maan2016-07-062-0/+201
|
* Add Gitlab::Git::PositionDouwe Maan2016-07-062-0/+182
|
* Extract parts of LegacyDiffNote into DiffOnNote concern and move part of ↵Douwe Maan2016-07-0613-102/+120
| | | | responsibility to other classes
* Style diff and blob file headers the same wayDouwe Maan2016-07-068-54/+77
|
* Remove unneeded divDouwe Maan2016-07-063-8/+4
|
* Add DiffFile#blob and #old_blobDouwe Maan2016-07-066-25/+31
|
* Add Timeless helper module to prevent updated_at from being updatedDouwe Maan2016-07-062-6/+17
|
* Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-0620-57/+111
|
* Rename MergeRequest methods that return commits or shas to be more clear and ↵Douwe Maan2016-07-0625-128/+162
| | | | consistent
* Store diff head and start commit shas on MR diffsDouwe Maan2016-07-063-7/+20
|
* Merge branch 'build-auto-refresh' into 'master' Jacob Schatz2016-07-062-5/+5
|\ | | | | | | | | | | | | | | | | Fixed issue with build auto-refresh not working ## What does this MR do? Due to the `.json` at the end of the build URL fetch, the page wont correctly auto-reload the build log. This fixes that. See merge request !5110
| * Fixed issue with build auto-refresh not workingbuild-auto-refreshPhil Hughes2016-07-062-5/+5
| |
* | Merge branch '18283-pluralize-stage-headings' into 'master' Jacob Schatz2016-07-063-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |
| * | Get rid of pluralize on stage namesAnnabel Dunstone2016-07-062-2/+2
| | |
* | | Merge branch '18858-options-dropdown-on-mobile-should-be-full-width' into ↵Jacob Schatz2016-07-061-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Added 100% width to open dropdown menus on mobile ## What does this MR do? Sets dropdown-menus to be 100% width on small screens. ## Are there points in the code the reviewer needs to double check? Do we want this on all dropdown menus or only dropdown menus activated by full-width buttons? /cc @dzaporozhets ## Why was this MR needed? Mobile UX. ## What are the relevant issue numbers? Closes #18858. ## Screenshots (if relevant) ![Screen_Shot_2016-06-22_at_00.14.09](/uploads/bd61721896bfac8af951374c2547acd6/Screen_Shot_2016-06-22_at_00.14.09.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 - [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 !4844
| * | | Added 100% width to open dropdown menus on mobile18858-options-dropdown-on-mobile-should-be-full-widthLuke "Jared" Bennett2016-06-221-0/+3
| | | |
* | | | Update CHANGELOG for 8.9.5Robert Speicher2016-07-061-9/+13
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'fix_ldap_config' into 'master' Drew Blessing2016-07-061-21/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix erroneous YAML spacing in LDAP configuration ## What does this MR do? Fix erroneous indentation in LDAP example configuration ## Are there points in the code the reviewer needs to double check? Is the indentation correct now? :joy: ## Why was this MR needed? Bad configs in docs suck. See merge request !4326
| * | | | Fix erroneous YAML spacing in LDAP configurationDrew Blessing2016-05-271-21/+21
| | | | |
* | | | | Merge branch 'gh-pull-requests' into 'master' Rémy Coutable2016-07-065-19/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-07-061-0/+1
| | | | | |
| * | | | | Consider that a GH exists only if both `ref`, and `sha` existDouglas Barbosa Alexandre2016-07-063-18/+31
| | | | | |
| * | | | | Doesn't trigger Git hooks when cleaning up restored branches from GitHubDouglas Barbosa Alexandre2016-07-061-1/+3
| | |_|/ / | |/| | |
* | | | | Merge branch 'escape-to-cancel-note' into 'master' Jacob Schatz2016-07-061-9/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cancel creating or editing note by hitting Escape /cc @rspeicher See merge request !5075
| * | | | | Use switch/when statementescape-to-cancel-noteDouwe Maan2016-07-051-21/+24
| | | | | |
View Lorry Controller Status