summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'new-diff-notes' into 'master' Douwe Maan2016-07-0749-393/+754
|\
| * Use HAML class syntax in diff line partialsDouwe Maan2016-07-072-5/+5
| * Make `DiffNote#update_position` privateDouwe Maan2016-07-071-19/+14
| * 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-064-9/+5
| * Make methods private that don't need to be publicDouwe Maan2016-07-061-43/+47
| * Add some more code comments.Douwe Maan2016-07-062-2/+4
| * 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-062-7/+17
| * Display new diff notes and allow creation through the web interfaceDouwe Maan2016-07-0610-63/+99
| * Allow reply-by-email with diff notesDouwe Maan2016-07-061-1/+28
| * 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-062-2/+105
| * Extract parts of LegacyDiffNote into DiffOnNote concern and move part of resp...Douwe Maan2016-07-068-76/+82
| * Style diff and blob file headers the same wayDouwe Maan2016-07-067-44/+72
| * Remove unneeded divDouwe Maan2016-07-063-8/+4
| * Add DiffFile#blob and #old_blobDouwe Maan2016-07-065-20/+10
| * Add Timeless helper module to prevent updated_at from being updatedDouwe Maan2016-07-061-6/+1
| * Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-0610-26/+54
| * Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-0611-89/+122
| * Store diff head and start commit shas on MR diffsDouwe Maan2016-07-061-7/+10
* | Merge branch 'pending-delete-project-notifications' into 'master' Robert Speicher2016-07-071-1/+8
|\ \
| * | Exclude projects pending delete from notificationsSean McGivern2016-07-071-1/+8
* | | Merge branch 'issue_3946' into 'master' Robert Speicher2016-07-0717-289/+388
|\ \ \
| * | | 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-0717-289/+385
* | | | Merge branch 'dz-remove-icons' into 'master' Jacob Schatz2016-07-071-2/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove icons from file edit tabsdz-remove-iconsDmitriy Zaporozhets2016-07-041-2/+0
* | | | Merge branch 'escape-file-extension' into 'master' Robert Speicher2016-07-071-1/+1
|\ \ \ \
| * | | | Escape file extension when parsing search results (!5141)winniehell2016-07-071-1/+1
| | |/ / | |/| |
* | | | fix 404 error, redirect back with flash messageJames Lopez2016-07-071-4/+1
|/ / /
* | | Fix invite user feature test and improve request member UI rowDmitriy Zaporozhets2016-07-071-1/+1
* | | Improve UI for member row on project/group members pagesDmitriy Zaporozhets2016-07-072-45/+53
* | | Add data when member joined a teamValery Sizov2016-07-071-0/+4
* | | Merge branch 'services_refactoring1' into 'master' Dmitriy Zaporozhets2016-07-0718-43/+37
|\ \ \
| * | | 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-072-2/+8
|\ \ \ \
| * | | | Show last push widget in upstream after push to forkDrew Blessing2016-07-062-2/+8
* | | | | Merge branch 'patch-3' into 'master' Rémy Coutable2016-07-071-14/+14
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Allow everyone to sort tags, not only those who has accessSerg2016-07-061-14/+14
| |/ / /
* | | | Merge branch 'build-auto-refresh' into 'master' Jacob Schatz2016-07-062-5/+5
|\ \ \ \
| * | | | 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-062-2/+2
|\ \ \ \
| * | | | Get rid of pluralize on stage namesAnnabel Dunstone2016-07-062-2/+2
* | | | | Merge branch '18858-options-dropdown-on-mobile-should-be-full-width' into 'ma...Jacob Schatz2016-07-061-0/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
View Lorry Controller Status