summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into zj-auto-devops-tablezj/gitlab-ce-zj-auto-devops-tableZeger-Jan van de Weg2017-09-0731-122/+68
|\
| * Merge branch 'breadcrumbs-extra-btns-remove' into 'master'Filipa Lacerda2017-09-0718-94/+23
| |\
| | * fixed new milstone button not being visiblePhil Hughes2017-09-061-1/+1
| | * fixed breadcrumb containerPhil Hughes2017-09-061-1/+1
| | * Moves the action buttons out of the breadcrumbsPhil Hughes2017-09-0618-92/+21
| * | Merge branch 'rs-remove-usage-ping-pretty' into 'master'Sean McGivern2017-09-072-3/+2
| |\ \
| | * | Remove the `pretty` parameter for `usage_data`rs-remove-usage-ping-prettyRobert Speicher2017-09-062-3/+2
| * | | Merge branch 'gitaly-tree-entries-fix' into 'master'Rémy Coutable2017-09-072-2/+4
| |\ \ \
| | * | | Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fixAlejandro Rodríguez2017-09-062-2/+4
| * | | | Fix mr tabs positionAnnabel Dunstone Gray2017-09-073-8/+16
| * | | | Merge branch '37023-remove-focus-styles-from-dropdown-empty-link' into 'master'Tim Zallmann2017-09-075-14/+22
| |\ \ \ \
| | * | | | Remove focus styles from dropdown empty link37023-remove-focus-styles-from-dropdown-empty-linkEric Eastwood2017-09-055-14/+22
| * | | | | Merge branch 'add_quick_submission_on_user_settings_page' into 'master'Tim Zallmann2017-09-071-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add quick submission on user settings pageVitaliy @blackst0ne Klachkov2017-09-021-1/+1
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into zj/gitlab-ce-zj...Kamil Trzcinski2017-09-06120-394/+577
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '35811-fix-copy-link-text-color' into 'master'Tim Zallmann2017-09-061-1/+1
| |\ \ \ \ \
| | * | | | | Prevent `btn-transparent` class from being added on `Copy link` actionkushalpandya2017-09-061-1/+1
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'fix/sm/33281-activerecord-recordinvalid-when-build-has-nil-prot...Kamil Trzciński2017-09-062-2/+0
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Remove only validationfix/sm/33281-activerecord-recordinvalid-when-build-has-nil-protectedShinya Maeda2017-09-072-2/+0
| | * | | | Revert set_protectedShinya Maeda2017-09-073-11/+4
| | * | | | Fix /models/ci/pipeline.rbShinya Maeda2017-09-061-1/+1
| | * | | | Use before_save :set_protectedShinya Maeda2017-09-063-4/+11
| | | |_|/ | | |/| |
| * | | | Merge branch 'ie-sidebar-icon-size' into 'master'Annabel Dunstone Gray2017-09-061-0/+4
| |\ \ \ \
| | * | | | Fixed sidebar icon size in ie11ie-sidebar-icon-sizePhil Hughes2017-09-061-0/+4
| * | | | | Merge branch '34509-improves-markdown-rendering-performance-for-commits-list'...Douwe Maan2017-09-0616-26/+61
| |\ \ \ \ \
| | * | | | | Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-listTiago Botelho2017-09-0617-33/+61
| | * | | | | Adds CommitDescriptionRendererTiago Botelho2017-09-061-0/+7
| * | | | | | Merge branch '35161_first_time_contributor_badge' into 'master'Sean McGivern2017-09-0615-19/+93
| |\ \ \ \ \ \
| | * | | | | | fixup whitespacemicael.bergeron2017-09-061-1/+1
| | * | | | | | add controller specmicael.bergeron2017-09-064-10/+8
| | * | | | | | remove lintmicael.bergeron2017-09-062-2/+2
| | * | | | | | fix note-role alignmentmicael.bergeron2017-09-061-3/+2
| | * | | | | | rework the contributor badgemicael.bergeron2017-09-067-20/+39
| | * | | | | | round of fixes after code reviewmicael.bergeron2017-09-064-7/+19
| | * | | | | | WIP: refactor the first-contributor to Issuablemicael.bergeron2017-09-0613-21/+59
| | * | | | | | fix #35161, add a first-time contributor badgemicael.bergeron2017-09-062-0/+8
| | |/ / / / /
| * | | | | | Merge branch '35441-fix-division-by-zero' into 'master'Robert Speicher2017-09-061-6/+10
| |\ \ \ \ \ \
| | * | | | | | Fix division by zero for blame age mapJeff Stubler2017-08-241-6/+10
| * | | | | | | Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master'Kamil Trzciński2017-09-061-5/+7
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into feature/gb/downl...Grzegorz Bizon2017-09-06121-916/+2190
| | |\ \ \ \ \ \ \
| | * | | | | | | | Do not use artifacts metadata to access single artifactGrzegorz Bizon2017-09-051-5/+7
| * | | | | | | | | Merge branch 'tc-test-admin-log-links' into 'master'Dmitriy Zaporozhets2017-09-061-1/+8
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Put loggers in before_action for easier overriding in EEtc-test-admin-log-linksToon Claes2017-09-061-1/+8
| * | | | | | | | | | Add collapsable sections for Pipeline SettingsKamil Trzciński2017-09-069-63/+89
| * | | | | | | | | | Merge branch 'generalize-profile-updates' into 'master'Douwe Maan2017-09-066-12/+70
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| | * | | | | | | | | Profile updates from providersAlexander Keramidas2017-09-066-12/+70
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'breadcrumbs-improvements' into 'master'Filipa Lacerda2017-09-0673-259/+234
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | removed show_new_nav? referencesbreadcrumbs-improvementsPhil Hughes2017-09-066-61/+14
| | * | | | | | | | Merge branch 'master' into breadcrumbs-improvementsPhil Hughes2017-09-0685-979/+529
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | * | | | | | | | fixed up JS to use a js-* classPhil Hughes2017-09-068-16/+20
View Lorry Controller Status