summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rephrase some system notes to be compatible with new system note stylerephrase-system-notesDouwe Maan2016-11-2423-124/+169
* Merge branch 'fix_sidekiq_stats_in_admin_area' into 'master' Robert Speicher2016-11-233-7/+30
|\
| * Fix sidekiq stats in admin areablackst0ne2016-11-233-7/+30
* | Merge branch '24756-clean-up-eslintrc-globals' into 'master' Alfredo Sumaran2016-11-2318-30/+53
|\ \
| * | keep json alphabetized24756-clean-up-eslintrc-globalsMike Greiling2016-11-221-6/+6
| * | add "gon" to list of expected globalsMike Greiling2016-11-221-0/+1
| * | clean up globals exemptions within .eslintrcMike Greiling2016-11-2218-25/+47
* | | Merge branch '24266-afraid-to-press-the-orange-button-on-merge-request-screen...Fatih Acet2016-11-224-5/+9
|\ \ \
| * | | Use btn-primary for running builds btnAnnabel Dunstone Gray2016-11-221-3/+3
| * | | deleted old changelog entry24266-afraid-to-press-the-orange-button-on-merge-request-screenDimitrie Hoekstra2016-11-221-4/+0
| * | | added proper changelog entryDimitrie Hoekstra2016-11-221-0/+4
| * | | If Build running change accept merge request when build succeeds button from ...Dimitrie Hoekstra2016-11-183-2/+6
* | | | Merge branch '24739-collapsed-build-list-sorting' into 'master' Fatih Acet2016-11-222-1/+5
|\ \ \ \
| * | | | add CHANGELOG entry for !7681Mike Greiling2016-11-221-0/+4
| * | | | sort pipeline graph builds and build groups by nameMike Greiling2016-11-221-1/+1
* | | | | Merge branch '24639-mr-widget-updates' into 'master' Fatih Acet2016-11-222-39/+1
|\ \ \ \ \
| * | | | | Remove view details link from MR widget24639-mr-widget-updatesAnnabel Dunstone Gray2016-11-181-3/+0
| * | | | | Unify all MR widget text colors and background colorsAnnabel Dunstone Gray2016-11-181-36/+1
* | | | | | Merge branch 'mrchrisw/mysql-install' into 'master' Achilleas Pipinellis2016-11-221-1/+8
|\ \ \ \ \ \
| * | | | | | Add omnibus rake task. Fix source envmrchrisw/mysql-installChris Wilson2016-08-191-1/+8
* | | | | | | Merge branch 'doc-for-config' into 'master' Achilleas Pipinellis2016-11-221-0/+22
|\ \ \ \ \ \ \
| * | | | | | | Update wordings by feedback from:doc-for-configLin Jen-Shin2016-06-231-7/+8
| * | | | | | | Add some clarification for some files under config/*Lin Jen-Shin2016-06-221-0/+21
* | | | | | | | Merge branch 'disable-calendar-deselection' into 'master' Fatih Acet2016-11-223-0/+46
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix deselecting calendar days on contribution graphClement Ho2016-11-043-0/+46
* | | | | | | | | Merge branch '24161-non-intuitive-buttons-for-import-sources-in-administrator...Fatih Acet2016-11-223-8/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Swapped buttons for checkboxes24161-non-intuitive-buttons-for-import-sources-in-administrator-settings-enable-disableLuke "Jared" Bennett2016-11-213-8/+10
* | | | | | | | | | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-11-221-1/+16
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'patch-1' of https://gitlab.com/ffittschen/gitlab-ce into patch-1Florian Fittschen2016-10-210-0/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Update github.mdFlorian2016-05-061-3/+4
| * | | | | | | | | | | Update github.mdFlorian2016-10-211-1/+16
* | | | | | | | | | | | Merge branch 'docs/optimize-images' into 'master' Achilleas Pipinellis2016-11-22384-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Reduce size of images from 25MB to 13MB using pngquantAchilleas Pipinellis2016-11-22384-0/+0
* | | | | | | | | | | | | Merge branch '24754-fix-npm-warnings-for-eslint-plugin-import' into 'master' Fatih Acet2016-11-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | roll back eslint-plugin-import node module to the version required by eslint-...24754-fix-npm-warnings-for-eslint-plugin-importMike Greiling2016-11-211-1/+1
* | | | | | | | | | | | | Merge branch 'emoji-btn-disabled' into 'master' Fatih Acet2016-11-223-42/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Disabled award emoji button when user is not logged inemoji-btn-disabledPhil Hughes2016-11-223-42/+60
* | | | | | | | | | | | | | Merge branch 'fix/build-without-trace-exceptions' into 'master' Kamil Trzciński2016-11-225-81/+124
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Improve name of build log state data attributefix/build-without-trace-exceptionsGrzegorz Bizon2016-11-223-3/+3
| * | | | | | | | | | | | | | Add Changelog entry for build trace exceptions fixGrzegorz Bizon2016-11-221-0/+4
| * | | | | | | | | | | | | | Include build trace status in data attribute alwaysGrzegorz Bizon2016-11-221-1/+1
| * | | | | | | | | | | | | | Improve reproducibility of build trace test exampleGrzegorz Bizon2016-11-221-2/+4
| * | | | | | | | | | | | | | Add missing feature tests for loading build traceGrzegorz Bizon2016-11-221-4/+16
| * | | | | | | | | | | | | | Add missing specs for loading build HTML traceGrzegorz Bizon2016-11-221-7/+23
| * | | | | | | | | | | | | | Refactor feature tests for project builds pageGrzegorz Bizon2016-11-221-75/+84
* | | | | | | | | | | | | | | Merge branch '24737-labeling-system-notes-downcase-labels' into 'master' Fatih Acet2016-11-223-7/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | resolves lowercase issue in system note for labels, label description and title24737-labeling-system-notes-downcase-labelsNur Rony2016-11-223-7/+31
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'docs/jira-update-api-docs' into 'master' Achilleas Pipinellis2016-11-222-15/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix list in JIRA service docsAchilleas Pipinellis2016-11-221-4/+4
| * | | | | | | | | | | | | | Add changes to JIRA api docsAchilleas Pipinellis2016-11-222-11/+9
View Lorry Controller Status