summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-0727-44/+219
|\
| * Only allow users that can merge to push to sourcebvl-allow-maintainer-to-pushBob Van Landuyt2018-03-072-3/+11
| * Link correct project when adding file to empty MRBob Van Landuyt2018-03-071-1/+1
| * Use Project#source_of_merge_requests-relationBob Van Landuyt2018-03-071-1/+1
| * Limit queries to a user-branch combinationBob Van Landuyt2018-03-072-31/+32
| * Add documentation for allowing maintainers to pushBob Van Landuyt2018-03-071-0/+1
| * Allow maintainers to edit directly in a forkBob Van Landuyt2018-03-0713-38/+70
| * Allow abilities on forks while MR is openBob Van Landuyt2018-03-072-0/+45
| * Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-0713-3/+91
* | Merge branch '39444-make-margin-around-dropdown-dividers-4px' into 'master'Clement Ho2018-03-071-1/+1
|\ \
| * | Set margins around dropdown dividers to 4px (based on grid)39444-make-margin-around-dropdown-dividers-4pxLukas Eipert2018-03-051-1/+1
* | | Merge branch 'fix/reduce-number-of-find-commit-for-log-tree' into 'master'Robert Speicher2018-03-071-2/+3
|\ \ \
| * | | Reduce number of FindCommit calls from RefsController#logs_treefix/reduce-number-of-find-commit-for-log-treeAhmad Sherif2018-03-061-2/+3
* | | | Merge branch '4326-fix-js-or-true' into 'master'Clement Ho2018-03-071-2/+8
|\ \ \ \
| * | | | Fix a JS bug in the websocket terminalNick Thomas2018-03-071-2/+8
* | | | | Merge branch 'jivl-new-modal-project-labels-milestones' into 'master'Filipa Lacerda2018-03-0715-101/+457
|\ \ \ \ \
| * | | | | used respond_to formats for persisting flash messages insteadjivl-new-modal-project-labels-milestonesJose Ivan Vargas2018-03-0610-84/+33
| * | | | | Add persistent flash messagesJose Ivan Vargas2018-03-017-5/+71
| * | | | | Changed selector names, address code concernsJose Ivan Vargas2018-03-0110-156/+167
| * | | | | Added vue based promotion modals for labels and milestonesJose Ivan Vargas2018-03-0115-96/+426
* | | | | | Merge branch 'dz-use-less-deprecated-methods-2' into 'master'Douwe Maan2018-03-073-3/+3
|\ \ \ \ \ \
| * | | | | | Use Project#full_name instead of name_with_namespaceDmitriy Zaporozhets2018-03-073-3/+3
* | | | | | | Merge remote-tracking branch 'dev/master'Robert Speicher2018-03-071-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5'Douwe Maan2018-03-071-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mr-commit-optimization' into 'master'Sean McGivern2018-03-074-8/+20
|\ \ \ \ \ \
| * | | | | | Don't do a commit lookup to present the MR entity, just return the shamr-commit-optimizationAlejandro Rodríguez2018-03-061-1/+1
| * | | | | | Use persisted/memoized value for MRs shas instead of doing git lookupsAlejandro Rodríguez2018-03-063-7/+19
* | | | | | | Merge branch 'jprovazn-api' into 'master'Sean McGivern2018-03-077-8/+25
|\ \ \ \ \ \ \
| * | | | | | | Add discussion APIjprovazn-apiJan Provaznik2018-03-077-8/+25
* | | | | | | | Merge branch '43486-update-language-about-version-check-in-admin-settings-and...Sean McGivern2018-03-071-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Clarify version check in admin settings43486-update-language-about-version-check-in-admin-settings-and-docsSean McGivern2018-03-071-2/+4
* | | | | | | | | Merge branch '43460-track-projects-a-user-contributed-to' into 'master'Yorick Peterse2018-03-072-0/+67
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Shortcut and return on duplicate record error.43460-track-projects-a-user-contributed-toAndreas Brandl2018-03-061-3/+3
| * | | | | | | | Nested transaction for find_or_create_by! queries.Andreas Brandl2018-03-061-5/+11
| * | | | | | | | Remove unnecessary safe guard.Andreas Brandl2018-03-061-6/+0
| * | | | | | | | Operate on ids to avoid unnecessary loading.Andreas Brandl2018-03-061-3/+3
| * | | | | | | | Singularize model name.Andreas Brandl2018-03-062-2/+2
| * | | | | | | | Rename to UserInteractedProjects.Andreas Brandl2018-03-062-5/+5
| * | | | | | | | Flush cached information about schema.Andreas Brandl2018-03-061-0/+6
| * | | | | | | | Only track contributions if table is available.Andreas Brandl2018-03-062-1/+12
| * | | | | | | | Address rubocop offenses.Andreas Brandl2018-03-061-28/+30
| * | | | | | | | Treat special cases accordingly.Andreas Brandl2018-03-061-1/+15
| * | | | | | | | Cache project/user combinations.Andreas Brandl2018-03-061-3/+19
| * | | | | | | | Track which projects a user contributed to.Andreas Brandl2018-03-062-0/+18
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'dz-plugins-project-integrations' into 'master'Dmitriy Zaporozhets2018-03-073-50/+73
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove plugins from project integrations pageDmitriy Zaporozhets2018-03-062-6/+9
| * | | | | | | | Remove boolean icons from plugins pageDmitriy Zaporozhets2018-03-051-1/+0
| * | | | | | | | Render plugins list on system hooks pageDmitriy Zaporozhets2018-03-053-53/+53
| * | | | | | | | Show plugins list on project integrations pageDmitriy Zaporozhets2018-03-052-0/+21
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Unify deployment_platform interface with EELin Jen-Shin2018-03-072-2/+3
View Lorry Controller Status