summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'da-refactor-broadcast-message' into 'master'Stan Hu2018-12-191-28/+9
|\
| * Refactor BroadcastMessage to use Gitlab::JsonCacheDouglas Barbosa Alexandre2018-12-191-28/+9
* | Merge branch 'ce-reduce-deploy_keys_controller-diff-with-ce' into 'master'Robert Speicher2018-12-192-2/+2
|\ \
| * | Make Projects::DeployKeysController EE-readyRémy Coutable2018-12-192-2/+2
| |/
* | Make LfsRequest EE-compatibleRémy Coutable2018-12-191-0/+6
|/
* Merge branch 'zj-pool-destruction' into 'master'Kamil Trzciński2018-12-195-3/+37
|\
| * Leave object pools when destroying projectsZeger-Jan van de Weg2018-12-195-3/+37
* | Merge branch 'osw-adjust-flaky-rails-logger-call' into 'master'Rémy Coutable2018-12-191-1/+5
|\ \
| * | Adjust flaky Rails logger call testOswaldo Ferreira2018-12-181-1/+5
* | | Merge branch '54146-fix-calendar-query' into 'master'Grzegorz Bizon2018-12-191-1/+1
|\ \ \
| * | | Fix calendar feed when sorted by priorityHeinrich Lee Yu2018-12-171-1/+1
* | | | Merge branch 'issue-55534' into 'master'Achilleas Pipinellis2018-12-191-1/+2
|\ \ \ \
| * | | | Fix typo: aunthenticator->authenticatorErik Huelsmann2018-12-181-1/+1
| * | | | Close #55534: link OTP auth less strictly to GoogleErik Huelsmann2018-12-181-1/+2
* | | | | Merge branch 'ce-8810-fix-weight-sort' into 'master'Sean McGivern2018-12-192-9/+11
|\ \ \ \ \
| * | | | | Backport of 8810-fix-weight-sortMario de la Ossa2018-12-182-9/+11
| |/ / / /
* | | | | Merge branch 'port-missing-code-from-ee-in-group_policy' into 'master'Douglas Barbosa Alexandre2018-12-181-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add a missing policy allowance in GroupPolicyRémy Coutable2018-12-181-0/+1
* | | | | Merge branch 'reduce-diff-with-ee-in-protected_refs_controller' into 'master'Douwe Maan2018-12-183-2/+10
|\ \ \ \ \
| * | | | | Reduce diff with EE in ProtectedRefsControllerRémy Coutable2018-12-173-2/+10
* | | | | | Merge branch 'osw-revert-suggestions-ff' into 'master'Douwe Maan2018-12-183-10/+4
|\ \ \ \ \ \
| * | | | | | Remove feature flag for suggest changes featureOswaldo Ferreira2018-12-183-10/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'force-reload-arguments-2' into 'master'Rémy Coutable2018-12-181-6/+2
|\ \ \ \ \ \
| * | | | | | Passing an argument to force an association to reload is now deprecatedJasper Maes2018-12-181-6/+2
| | |/ / / / | |/| | | |
* | | | | | Add explanatory help text to text inputs on user profile settings pageMartin Wortschack2018-12-186-21/+44
* | | | | | Remove content disposition attachment displaying all ssh keysFrancisco Javier López2018-12-181-1/+0
* | | | | | Merge branch 'ce-6635-extract-ee-specific-files-lines-for-app-controllers-adm...Lin Jen-Shin2018-12-181-1/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Make Admin::HealthCheckController EE-compatibleRémy Coutable2018-12-171-1/+7
* | | | | | Merge branch '41766-create-releases-page' into 'master'Kamil Trzciński2018-12-188-33/+63
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Move Projects::ReleasesController under TagsAlessio Caiazza2018-12-184-36/+45
| * | | | | Adds releases index routeFilipa Lacerda2018-12-185-6/+27
* | | | | | Merge branch 'reduce-imports_controller-diff-with-ce' into 'master'Lin Jen-Shin2018-12-181-5/+5
|\ \ \ \ \ \
| * | | | | | Make Projects::ImportsController EE-compatibleRémy Coutable2018-12-171-5/+5
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '51485-new-issue-labels-note' into 'master'Rémy Coutable2018-12-182-10/+17
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Run CommonSystemNotesService on issuable createHeinrich Lee Yu2018-12-182-10/+17
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs-except-deprecation' into 'master'Sean McGivern2018-12-183-9/+12
|\ \ \ \ \
| * | | | | Change deprecated `except!` usagesRobert Speicher2018-12-163-9/+12
| |/ / / /
* | | | | Merge branch 'bvl-hide-confidential-events-take2' into 'master'Sean McGivern2018-12-182-13/+62
|\ \ \ \ \
| * | | | | Hide confidential events in rubyBob Van Landuyt2018-12-172-13/+62
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fj-fix-action-name-jobscontroller' into 'master'Rémy Coutable2018-12-181-1/+1
|\ \ \ \ \
| * | | | | Fixed action name in JobsControllerFrancisco Javier López2018-12-171-1/+1
| | |_|/ / | |/| | |
* | | | | Add "none" syntax highlighting "color" schemekhm2018-12-184-2/+265
* | | | | Add NGINX 0.16.0 and above metricsJoshua Lambert2018-12-172-16/+23
* | | | | Merge branch 'reduce-service-params-diff-with-ce' into 'master'Robert Speicher2018-12-171-1/+5
|\ \ \ \ \
| * | | | | Use the EE version of ServiceParamsRémy Coutable2018-12-171-1/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'avoid-wrapped-clone-button' into 'master'Mike Greiling2018-12-171-2/+2
|\ \ \ \ \
| * | | | | Re-align project title row and repo button containersAndreas Kämmerle2018-12-141-2/+2
* | | | | | Merge branch '53954-resolved-non-diff-discussions-on-merge-requests-no-longer...Phil Hughes2018-12-173-11/+32
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add message saying who resolved nondiff discussionsbigelow2018-12-173-11/+32
| | |_|/ / | |/| | |
* | | | | Add new predefined variable CI_COMMIT_SHORT_SHAJason Lenny2018-12-171-0/+1
| |_|/ / |/| | |