summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'andr3-remove-mr-regressions-fixes-from-master' into 'master'Filipa Lacerda2018-08-0123-401/+196
|\
| * Revert "Merge branch '_acet-fix-outdated-discussions' into 'master'"André Luís2018-08-019-72/+20
| * Revert "Merge branch '_acet-fix-expanding-context-lines' into 'master'"André Luís2018-08-013-0/+4
| * Revert "Merge branch '_acet-fix-mr-autosave' into 'master'"André Luís2018-08-015-55/+33
| * Revert "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master'"André Luís2018-08-015-142/+40
| * Revert "Merge branch 'tz-mr-refactor-memory-reduction' into 'master'"André Luís2018-08-019-139/+93
| * Revert "Merge branch 'tz-mr-refactor-mem-posting' into 'master'"André Luís2018-08-013-8/+21
* | Merge branch 'timeouted' into 'master'Grzegorz Bizon2018-08-011-1/+1
|\ \
| * | correct error messageDiana Stanley2018-07-171-1/+1
* | | Merge branch 'runner-features' into 'master'Grzegorz Bizon2018-08-014-24/+55
|\ \ \
| * | | Add specs for unsupported runnerKamil Trzciński2018-08-011-1/+1
| * | | Fix spec failuresKamil Trzciński2018-08-011-3/+3
| * | | More clever way for testing runner featuresKamil Trzciński2018-08-011-8/+14
| * | | If reports are used, require runner to expose `upload_multiple_artifacts` fea...Kamil Trzciński2018-08-011-1/+7
| * | | Improve CommitStatusPresenterKamil Trzciński2018-08-011-7/+8
| * | | Fix current spec failuresKamil Trzciński2018-08-012-9/+5
| * | | Fix spec failuresKamil Trzciński2018-08-013-4/+4
| * | | Add `runner_unsupported` CI failureKamil Trzciński2018-08-014-15/+37
* | | | Merge branch 'fix-multiple-scopes' into 'master'Grzegorz Bizon2018-08-012-6/+24
|\ \ \ \ | |/ / / |/| | |
| * | | Support multiple scopes when using authing container registry scopesKamil Trzciński2018-08-012-6/+24
* | | | Resolve "Allow issue's Internal ID (`iid`) to be set when creating via the API"Jamie Schembri2018-08-012-7/+46
* | | | Merge branch 'follow-up-20723' into 'master'Sean McGivern2018-08-012-8/+8
|\ \ \ \
| * | | | Fix a few disrepencies between CE and EE in the lines orderingRémy Coutable2018-08-012-8/+8
* | | | | Resource event modelJan Provaznik2018-08-015-0/+96
* | | | | Merge branch 'fj-6860-instance-level-project-templates' into 'master'Sean McGivern2018-08-013-34/+58
|\ \ \ \ \
| * | | | | Code review comments appliedfj-6860-instance-level-project-templatesFrancisco Javier López2018-07-251-1/+1
| * | | | | Code review comment appliedFrancisco Javier López2018-07-231-2/+2
| * | | | | EE PortFrancisco Javier López2018-07-203-34/+58
* | | | | | Merge branch 'dz-labels-search' into 'master'Dmitriy Zaporozhets2018-08-014-6/+57
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Update locale with labels search page stringsDmitriy Zaporozhets2018-07-311-2/+3
| * | | | | Show different not fount message for project labels searchDmitriy Zaporozhets2018-07-311-3/+6
| * | | | | Make few minor styling changes to project labels pageDmitriy Zaporozhets2018-07-311-6/+6
| * | | | | Add more UI logic to label search functionalityDmitriy Zaporozhets2018-07-311-5/+13
| * | | | | Move search param check into own method in app/finders/labels_finder.rbDmitriy Zaporozhets2018-07-311-1/+5
| * | | | | Add no labels found block for project labels pageDmitriy Zaporozhets2018-07-311-0/+4
| * | | | | Improve labels search UI on project labels pageDmitriy Zaporozhets2018-07-311-2/+8
| * | | | | Add feature specs for project labels searchDmitriy Zaporozhets2018-07-311-1/+1
| * | | | | Add search form to project labels pageDmitriy Zaporozhets2018-07-311-2/+5
| * | | | | Add ability to filter labels by title or descriptionDmitriy Zaporozhets2018-07-313-1/+23
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sh-lfs-fix-content-type' into 'master'Nick Thomas2018-07-311-1/+6
|\ \ \ \ \
| * | | | | Fix LFS uploads not working with git-lfs 2.5.0Stan Hu2018-07-311-1/+6
* | | | | | Merge branch 'revert-c90d7633' into 'master'Rémy Coutable2018-07-316-82/+9
|\ \ \ \ \ \
| * | | | | | Revert "Merge branch '48098-mutual-auth-cluster-applications' into 'master'"Mayra Cabrera2018-07-316-82/+9
* | | | | | | Code cleaning in PostReceive servicesFrancisco Javier López 🌴 (About to) On vacation; back on August 22th!2018-07-313-38/+53
|/ / / / / /
* | | | | | Merge branch 'todos-visibility-change' into 'master'Sean McGivern2018-07-3114-7/+293
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove todos when project feature visibility changesJarka Kadlecová2018-07-316-10/+76
| * | | | | Fix removing todos for confidential issuesJarka Kadlecová2018-07-302-0/+13
| * | | | | Delete todos when users loses target read permissionsJarka Kadlecová2018-07-3012-7/+214
* | | | | | Merge branch 'fix-storage-size-for-artifacts-change' into 'master'Kamil Trzciński2018-07-311-3/+20
|\ \ \ \ \ \
| * | | | | | Update total storage size when changing size of artifactsPeter Marko2018-07-271-3/+20