summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix thread join issuefix/import-url-migrationJames Lopez2016-07-081-4/+2
|
* import_url migration performance improvementsJames Lopez2016-07-081-6/+28
| | | | | | Nullifying empty import_urls upfront so the number of projects with import_url not NULL decreases to 1/5. Also, now processing batches in blocks of 1000, with a threaded process - a bit experimental.
* Merge branch 'escape-file-extension' into 'master' Robert Speicher2016-07-072-1/+2
|\ | | | | | | | | | | | | | | | | Escape file extension when parsing search results When a file extension contains characters which have a meaning in regular expressions, the search may crash. Fixes #18553 See merge request !5141
| * Escape file extension when parsing search results (!5141)winniehell2016-07-072-1/+2
| |
* | Merge branch 'fix/import-controller-error' into 'master' Robert Speicher2016-07-073-4/+19
|\ \ | |/ |/| | | | | | | | | Fixes 404 redirect after validation fails importing a project Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19558 See merge request !5143
| * added testJames Lopez2016-07-071-0/+17
| |
| * added changelogfix/import-controller-errorJames Lopez2016-07-071-0/+1
| |
| * fix 404 error, redirect back with flash messageJames Lopez2016-07-071-4/+1
|/
* Merge branch 'fix/import-export-log' into 'master' Rémy Coutable2016-07-072-2/+2
|\ | | | | | | | | | | | | | | | | | | Fix log statements in import/export Fixes - as seen in the logs: ``` Import/Export error raised on /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/import_export/file_importer.rb:19:in `rescue in import': undefined method `message' for #<String:0x007fc45e977e10> ``` See merge request !5129
| * fix log statements in import/exportJames Lopez2016-07-072-2/+2
| |
* | Merge branch 'member_timeago' into 'master' Dmitriy Zaporozhets2016-07-074-42/+56
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add information when member joined a team ## What does this MR do? It adds timeago label by every member on team page ## Are there points in the code the reviewer needs to double check? Yes, maybe design is not OK, please check. ## Why was this MR needed? It's useful information ## What are the relevant issue numbers? ## Screenshots (if relevant) ![joxi_screenshot_1467820915126](/uploads/9e5657443a10a9fe204367d7b6749b1f/joxi_screenshot_1467820915126.png) See merge request !5116
| * | Fix invite user feature test and improve request member UI rowDmitriy Zaporozhets2016-07-072-2/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Improve UI for member row on project/group members pagesDmitriy Zaporozhets2016-07-072-45/+53
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add data when member joined a teamValery Sizov2016-07-072-0/+5
|/ /
* | Merge branch 'services_refactoring1' into 'master' Dmitriy Zaporozhets2016-07-0718-43/+37
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Services: code style fixes, minor refactoring ## What does this MR do? It contains code style fixes, minor refactoring and also it removes some unnecessary comments. Every comment require a support just like a regular code line and this is why we should avoid using comments everywhere unless it's really helpful. Martin Fowler said "Find comment and refactor the code around it" :) our code is not that bad so let's not spoil it with comments. ## Why was this MR needed? Because GitLab is a live example of awesome code. Let's keep up a good job :) See merge request !5112
| * | Services: code style fixes, minor refactoringservices_refactoring1Valery Sizov2016-07-0618-43/+37
| | |
* | | Merge branch 'show_push_widget_in_upstream' into 'master' Rémy Coutable2016-07-073-2/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show last push widget in upstream after push to fork ## What does this MR do? Show the last push widget in the upstream project when you push to a fork. ## Are there points in the code the reviewer needs to double check? In the view, I'm checking if `@project` in the first part of the conditional. I felt it was necessary in case `@project` wasn't an object in all cases. Will it ever not be there? Is this check necessary? Should there be tests? I don't see existing ones for this. ## Why was this MR needed? I use the fork workflow everywhere and it has annoyed me for some time that the last push widget doesn't show up when viewing the upstream project. I'm almost never viewing the fork in GitLab so I want to be able to easily create a MR in any case. ## Screenshots (if relevant) **Widget in upstream repo:** ![Screen_Shot_2016-06-23_at_10.05.29_AM](/uploads/f823642e40cf059c3793db6cf00bba50/Screen_Shot_2016-06-23_at_10.05.29_AM.png) **Widget in fork**: ![Screen_Shot_2016-06-23_at_10.05.25_AM](/uploads/1a976241186ec42cdc43c80bea0c856b/Screen_Shot_2016-06-23_at_10.05.25_AM.png) **Widget on dashboard**: ![Screen_Shot_2016-06-23_at_10.06.07_AM](/uploads/084ac35f67735aec8042d9bc904255fe/Screen_Shot_2016-06-23_at_10.06.07_AM.png) See merge request !4880
| * | | Show last push widget in upstream after push to forkDrew Blessing2016-07-063-2/+9
| | | |
* | | | Merge branch 'patch-3' into 'master' Rémy Coutable2016-07-072-14/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow everyone to order tags, not only those who has access ## What does this MR do? Allows everyone to view tags by different order (by name, date, etc), not only those who has access ## Are there points in the code the reviewer needs to double check? Just check how it's rendered. ## Why was this MR needed? Because now I can't order other's project tags. ## What are the relevant issue numbers? #15438 ## Screenshots (if relevant) Exist in related issue. Look [one comment](https://gitlab.com/gitlab-org/gitlab-ce/issues/15438#note_12888763) and [just below there is another one](https://gitlab.com/gitlab-org/gitlab-ce/issues/15438#note_12888819). ## Does this MR meet the acceptance criteria? Probably, no need See merge request !5105
| * | | | Allow everyone to sort tags, not only those who has accessSerg2016-07-062-14/+15
| | | | |
* | | | | 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
View Lorry Controller Status