summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | |
| * | | | | Double to single quotesDouwe Maan2016-07-041-1/+1
| | | | | |
| * | | | | Add confirmation when canceling creating/editing with changesDouwe Maan2016-07-041-0/+12
| | | | | |
| * | | | | Cancel creating or editing note by hitting EscapeDouwe Maan2016-07-041-5/+20
| | | | | |
* | | | | | Merge branch 'remove-lowercase-gitlab-ci-yml' into 'master' Robert Speicher2016-07-0615-238/+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>
| * | | | | Remove duplicate templates that are lowercaseRémy Coutable2016-07-0614-235/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch '15094-throttling-pushes_since_gc' into 'master' Douwe Maan2016-07-062-2/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Throttle the update of `project.pushes_since_gc` to 1 minute ## What does this MR do? Throttle the update of `project.pushes_since_gc` to alleviate DB load ## What are the relevant issue numbers? Relates to #15094 ## 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 - ~~[ ] 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 !5083
| * | | | | | Throttle the update of `project.pushes_since_gc` to 1 minute15094-throttling-pushes_since_gcPaco Guzman2016-07-052-2/+9
| | | | | | |
* | | | | | | Merge branch '19092-fix-event-for-legacydiffnote-not-considered-note' into ↵Douwe Maan2016-07-063-3/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-062-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Fix diff comments not showing up in activity feedRémy Coutable2016-07-043-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'shell-version-bump' into 'master' Douwe Maan2016-07-061-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump GITLAB_SHELL_VERSION to 3.2.0 Bump GITLAB_SHELL_VERSION to 3.2.0 Needed for !4696 to properly work. Blocked by gitlab-org/gitlab-shell!62 See merge request !5101
| * | | | | | | | Bump GITLAB_SHELL_VERSION to 3.2.0shell-version-bumpPatricio Cano2016-07-051-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'gh-labels' into 'master' Robert Speicher2016-07-0611-54/+123
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow `?`, or `&` for label names Closes #18727 See merge request !4724
| * | | | | | | | Fix unescaped strings in the labels dropdown templategh-labelsDouglas Barbosa Alexandre2016-07-061-2/+2
| | | | | | | | |
| * | | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-07-051-0/+1
| | | | | | | | |
| * | | | | | | | Render label name contains ?, & in the labels dropdown without escapingDouglas Barbosa Alexandre2016-07-052-6/+5
| | | | | | | | |
| * | | | | | | | Use CGI.unescapeHTML rather than doing the gsub with a mapDouglas Barbosa Alexandre2016-07-052-12/+2
| | | | | | | | |
| * | | | | | | | Move `unescape_html_entities` from LabelsHelper to Label modelDouglas Barbosa Alexandre2016-07-054-19/+13
| | | | | | | | |
| * | | | | | | | Render references for labels that name contains ?, or &Douglas Barbosa Alexandre2016-07-056-17/+77
| | | | | | | | |
| * | | | | | | | Allow '?', or '&' for label titlesDouglas Barbosa Alexandre2016-07-056-44/+69
| |/ / / / / / /
* | | | | | | | Merge branch 'fix/import-url-validator' into 'master' Robert Speicher2016-07-066-4/+156
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
View Lorry Controller Status