summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | 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 'pending-delete-project-notifications' into 'master' Robert Speicher2016-07-074-1/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude projects pending delete from notifications Make `NotificationSetting.for_projects` exclude projects that are excluded by the default scope on `Project`. (At the moment, that's projects with `pending_delete: true`.) See https://gitlab.com/gitlab-com/support-forum/issues/819 See merge request !5138
| * | | | | | | | | | | | | | | | | | | | Exclude projects pending delete from notificationsSean McGivern2016-07-074-1/+34
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the Sidekiq job fails for some reason, a project can be 'stuck' pending deletion. The project can't be viewed, so it shouldn't be available through the notification settings association as this will throw an exception when we try to show the link.
* | | | | | | | | | | | | | | | | | | | Merge branch 'issue_3946' into 'master' Robert Speicher2016-07-0721-296/+399
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve UI consistency for admin area Closes #3946 See merge request !4424
| * | | | | | | | | | | | | | | | | | | | Namespaces should filter remotelyAlfredo Sumaran2016-07-071-0/+1
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Rephrase deletion alert messageAlfredo Sumaran2016-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Do not show Any Namespace option when neededAlfredo Sumaran2016-07-072-3/+5
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Layout for Users Groups and Projects on admin areaAlfredo Sumaran2016-07-0721-296/+396
| | |_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'dz-remove-icons' into 'master' Jacob Schatz2016-07-071-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove icons from file edit tabs We don't need this icons and it also inconsistent with current UI See merge request !5072
| * | | | | | | | | | | | | | | | | | | Remove icons from file edit tabsdz-remove-iconsDmitriy Zaporozhets2016-07-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | | | | | | 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