summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-fix-issue-20776' into 'master' Robert Speicher2016-10-111-1/+13
|\
| * Fix Error 500 when viewing old merge requests with bad diff datash-fix-issue-20776Stan Hu2016-10-101-1/+13
* | Merge branch 'new-gitlab-users-clear_all_authentication_tokens-task' into 'ma...Robert Speicher2016-10-111-0/+5
|\ \
| * | Add a safeguard in User#set_projects_limitnew-gitlab-users-clear_all_authentication_tokens-taskRémy Coutable2016-10-111-0/+5
* | | Merge branch 'precalculate-trending-projects' into 'master' Robert Speicher2016-10-115-31/+50
|\ \ \
| * | | Precalculate trending projectsprecalculate-trending-projectsYorick Peterse2016-10-105-31/+50
* | | | Merge branch 'empty-mrs' into 'master' Rémy Coutable2016-10-115-47/+52
|\ \ \ \
| * | | | Allow empty merge requestsArtem Sidorenko2016-10-115-47/+52
* | | | | Merge branch 'reserve-robots-txt-namespace' into 'master' Robert Speicher2016-10-111-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add `robots.txt` to the list of reserved namespacesNick Thomas2016-10-111-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'dz-cleanup-routing' into 'master' Dmitriy Zaporozhets2016-10-111-25/+0
|\ \ \ \
| * | | | Remove NamespacesControllerDmitriy Zaporozhets2016-10-101-25/+0
| | |/ / | |/| |
* | | | Merge branch '23118-use-one-style-of-naming-js-files' into 'master' Fatih Acet2016-10-115-0/+0
|\ \ \ \
| * | | | Formatted all app/assets/javascripts to underscore naming convention23118-use-one-style-of-naming-js-filesLuke Bennett2016-10-105-0/+0
* | | | | Merge branch 'simplify-compare-page-text' into 'master' Fatih Acet2016-10-101-1/+1
|\ \ \ \ \
| * | | | | Changed 'Compare branches, tags or commit ranges' to 'Compare Git revisions'simplify-compare-page-textLuke Bennett2016-10-101-1/+1
| |/ / / /
* | | | | Merge branch '20356-network-commit-hash-input-placeholder-corrections' into '...Fatih Acet2016-10-101-1/+1
|\ \ \ \ \
| * | | | | Changed placeholder to 'Commit hash'20356-network-commit-hash-input-placeholder-correctionsLuke Bennett2016-10-101-1/+1
| |/ / / /
* | | | | Merge branch 'fix-options-caret-mobile-viewport' into 'master' Fatih Acet2016-10-102-2/+2
|\ \ \ \ \
| * | | | | Fix inconsistent options dropdown caret on mobile viewportsClement Ho2016-10-082-2/+2
* | | | | | Merge branch 'mr-file-path-copy-btn' into 'master' Fatih Acet2016-10-102-2/+3
|\ \ \ \ \ \
| * | | | | | Added copy file path button to diffsmr-file-path-copy-btnPhil Hughes2016-10-102-2/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'remove-redundant-mixins' into 'master' Annabel Dunstone Gray2016-10-1021-50/+39
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Remove redundant mixinsClement Ho2016-10-0821-50/+39
| | |/ / / | |/| | |
* | | | | Remove Ci::ApplicationControllerTakuya Noguchi2016-10-103-9/+2
* | | | | Merge branch 'fix/async-pipeline-processing-stale-data' into 'master' Kamil Trzciński2016-10-102-11/+23
|\ \ \ \ \
| * | | | | Check for transition loopback in commit statusfix/async-pipeline-processing-stale-dataGrzegorz Bizon2016-10-081-1/+3
| * | | | | Add temporary fix for race condition in MWBSGrzegorz Bizon2016-10-081-0/+3
| * | | | | Improve transitions and run hooks after transactionGrzegorz Bizon2016-10-081-18/+20
| * | | | | Fix ci pipeline processing with async jobsGrzegorz Bizon2016-10-072-14/+19
* | | | | | Merge branch 'namespace-validation-fixes' into 'master' Sean McGivern2016-10-101-8/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Correct namespace validation to forbid bad names #21077Will Starms2016-10-071-8/+6
* | | | | | Merge branch '23123-build-sidebar-selected-build' into 'master' Rémy Coutable2016-10-101-1/+1
|\ \ \ \ \ \
| * | | | | | Fix wrong icon in CI build detail sidebar: right-arrow => arrow-right23123-build-sidebar-selected-buildRémy Coutable2016-10-101-1/+1
* | | | | | | Merge branch 'bpj-mr-loop' into 'master' Jacob Schatz2016-10-101-24/+14
|\ \ \ \ \ \ \
| * | | | | | | Debounce GfmAutoComplete setup and simplify code somewhat.bpj-mr-loopBryce Johnson2016-10-071-24/+14
* | | | | | | | Merge branch 'adam-commit-search-case-insensitive' into 'master' Sean McGivern2016-10-101-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Make searching for commits case insensitive.Adam Niedzielski2016-10-101-2/+4
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '22373-reduce-queries-in-api-helpers-find_project' into 'master' Yorick Peterse2016-10-101-6/+12
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Improve project policy specAlejandro Rodríguez2016-10-061-6/+12
* | | | | | | | Merge branch 'gjlaubenstein/gitlab-ce-21712-change-issue-show-html-title'Robert Speicher2016-10-104-4/+4
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | reword html titles for merge requests and issuesGreg Laubenstein2016-10-094-4/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Prevent conflict b/w search field and its dropdownBrennan Roberts2016-10-101-0/+1
|/ / / / / /
* | | | | | Merge branch '22953-label-with-long-title-overlaps-description-field' into 'm...Annabel Dunstone Gray2016-10-071-0/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Truncate long labels with ellipsis in labels pagevictorwu4162016-10-061-0/+7
* | | | | | Merge branch '23096-expire-artifacts-per-job' into 'master' Yorick Peterse2016-10-072-6/+16
|\ \ \ \ \ \
| * | | | | | ExpireBuildArtifactsWorker query builds table without ordering enqueuing one ...23096-expire-artifacts-per-jobPaco Guzman2016-10-072-6/+16
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '22774-retouch-environments-deployments' into 'master' Jacob Schatz2016-10-077-53/+105
|\ \ \ \ \ \
| * | | | | | Removes `try`Filipa Lacerda2016-10-061-1/+1
| * | | | | | Removes unused variableFilipa Lacerda2016-10-061-2/+0
View Lorry Controller Status