summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Only allow users that can merge to push to sourcebvl-allow-maintainer-to-pushBob Van Landuyt2018-03-074-15/+33
* 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-078-65/+109
* Add documentation for allowing maintainers to pushBob Van Landuyt2018-03-076-3/+18
* Set `allow_maintainer_to_push` using the APIBob Van Landuyt2018-03-075-30/+65
* Allow maintainers to edit directly in a forkBob Van Landuyt2018-03-0719-79/+247
* Allow maintainers to push to a single branchBob Van Landuyt2018-03-072-1/+40
* Allow abilities on forks while MR is openBob Van Landuyt2018-03-076-3/+138
* Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-0722-4/+324
* Add `allow_maintainer_to_push` to `merge_requests`Bob Van Landuyt2018-03-072-0/+19
* Merge branch 'patch-19' into 'master'Stan Hu2018-03-071-0/+1
|\
| * add nginx_status monitoring detailsBen Bodenmiller2018-03-071-0/+1
* | Merge branch 'mr-commit-optimization' into 'master'Sean McGivern2018-03-077-15/+30
|\ \
| * | Don't do a commit lookup to present the MR entity, just return the shamr-commit-optimizationAlejandro Rodríguez2018-03-062-5/+3
| * | Use persisted/memoized value for MRs shas instead of doing git lookupsAlejandro Rodríguez2018-03-065-10/+27
* | | Merge branch 'jprovazn-api' into 'master'Sean McGivern2018-03-0722-596/+1311
|\ \ \
| * | | Add discussion APIjprovazn-apiJan Provaznik2018-03-0722-596/+1311
* | | | Merge branch '43486-update-language-about-version-check-in-admin-settings-and...Sean McGivern2018-03-073-12/+20
|\ \ \ \
| * | | | Clarify version check in admin settings43486-update-language-about-version-check-in-admin-settings-and-docsSean McGivern2018-03-073-12/+20
* | | | | Merge branch 'replace_redcarpet_with_cmark' into 'master'Sean McGivern2018-03-0712-35/+165
|\ \ \ \ \
| * | | | | Add CommonMark markdown enginereplace_redcarpet_with_cmarkblackst0ne2018-03-0712-35/+165
* | | | | | Merge branch '43460-track-projects-a-user-contributed-to' into 'master'Yorick Peterse2018-03-078-0/+299
|\ \ \ \ \ \
| * | | | | | Shortcut and return on duplicate record error.43460-track-projects-a-user-contributed-toAndreas Brandl2018-03-061-3/+3
| * | | | | | Improve robustness of migration.Andreas Brandl2018-03-061-6/+39
| * | | | | | 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-062-5/+5
| * | | | | | Singularize model name.Andreas Brandl2018-03-064-9/+9
| * | | | | | For MySQL, foreign keys are dependent on index.Andreas Brandl2018-03-062-3/+6
| * | | | | | Rename to UserInteractedProjects.Andreas Brandl2018-03-0610-60/+60
| * | | | | | Improve migration robustness and speed.Andreas Brandl2018-03-063-4/+10
| * | | | | | Add changelog.Andreas Brandl2018-03-061-0/+5
| * | | | | | Flush cached information about schema.Andreas Brandl2018-03-061-0/+6
| * | | | | | Only track contributions if table is available.Andreas Brandl2018-03-064-2/+36
| * | | | | | Address rubocop offenses.Andreas Brandl2018-03-062-34/+35
| * | | | | | Treat special cases accordingly.Andreas Brandl2018-03-062-1/+23
| * | | | | | Cache project/user combinations.Andreas Brandl2018-03-062-6/+23
| * | | | | | Track which projects a user contributed to.Andreas Brandl2018-03-064-0/+63
| * | | | | | Simpler migration strategy for MySQL.Andreas Brandl2018-03-061-29/+58
| * | | | | | Add post-migration to populate user_contributed_projects table.Andreas Brandl2018-03-061-0/+48
| * | | | | | Create user_contributed_projects table.Andreas Brandl2018-03-062-0/+32
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'dz-plugins-project-integrations' into 'master'Dmitriy Zaporozhets2018-03-075-50/+88
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add feature test for plugins on system hooks pagedz-plugins-project-integrationsDmitriy Zaporozhets2018-03-061-0/+10
| * | | | | Remove plugins from project integrations pageDmitriy Zaporozhets2018-03-063-6/+14
| * | | | | 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
| | |_|_|/ | |/| | |
* | | | | Merge branch 'consistent-deployment_platform' into 'master'Grzegorz Bizon2018-03-072-2/+3
|\ \ \ \ \
| * | | | | Unify deployment_platform interface with EELin Jen-Shin2018-03-072-2/+3
View Lorry Controller Status