summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add unicorn-soft-timeoutbjk/unicorn-soft-timeoutBen Kochie2017-09-112-0/+5
* Merge branch 'sh-bump-grape-logging-for-status-codes' into 'master'Robert Speicher2017-09-102-3/+3
|\
| * Bump grape_logging gem to 1.7.0 to get status codes for error messagessh-bump-grape-logging-for-status-codesStan Hu2017-09-102-3/+3
|/
* Merge branch 'remove-bootlint' into 'master'Clement Ho2017-09-082-6/+0
|\
| * Remove bootlint which takes 1 second of render time on developmentJacob Schatz2017-09-082-6/+0
|/
* Merge branch 'sidebar-drop-shadow' into 'master'Annabel Dunstone Gray2017-09-082-0/+12
|\
| * Adds drop shadow to the expanded sidebarPhil Hughes2017-09-082-0/+12
|/
* Merge branch 'revert-f2421b2b' into 'master'Robert Speicher2017-09-0833-648/+111
|\
| * Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-...revert-f2421b2bRubén Dávila2017-09-0833-648/+111
* | Merge branch 'fix/ldap-typo-docs' into 'master'Achilleas Pipinellis2017-09-081-1/+1
|\ \
| * | Update ldap.mdfix/ldap-typo-docsJames Lopez2017-09-081-1/+1
* | | Merge branch 'docs-quick-fix' into 'master'Achilleas Pipinellis2017-09-083-6/+11
|\ \ \
| * | | index project settings doc from other indexesMarcia Ramos2017-09-082-0/+5
| * | | copyeditMarcia Ramos2017-09-081-5/+5
| * | | fixes linkMarcia Ramos2017-09-081-1/+1
|/ / /
* | | Merge branch 'fix/gb/qa/new-navigation-support' into 'master'Rémy Coutable2017-09-081-10/+11
|\ \ \ | |/ / |/| |
| * | Fix GitLab QA for new navigation enabled by defaultfix/gb/qa/new-navigation-supportGrzegorz Bizon2017-09-081-10/+11
* | | Merge branch 'jk-update-dependencies' into 'master'Achilleas Pipinellis2017-09-081-293/+326
|\ \ \
| * | | Update dependencies license list for 10.0jk-update-dependenciesJarka Kadlecova2017-09-081-293/+326
| |/ /
* | | Merge branch 'jk-update-templates' into 'master'Achilleas Pipinellis2017-09-084-4/+55
|\ \ \ | |_|/ |/| |
| * | Update license templates for 10.0jk-update-templatesJarka Kadlecova2017-09-084-4/+55
| |/
* | Merge branch 'docs-new-topic-projects-settings' into 'master'Achilleas Pipinellis2017-09-088-5/+80
|\ \
| * | Docs new index for project's settingsMarcia Ramos2017-09-088-5/+80
|/ /
* | Merge branch 'fix-tooltip-width-issue-board' into 'master'Phil Hughes2017-09-082-1/+6
|\ \
| * | Fix tooltip width on collapsed issue board column titlesJedidiah2017-09-082-1/+6
|/ /
* | Merge branch 'docs/yaml-hidden-keys' into 'master'Marcia Ramos2017-09-081-11/+17
|\ \
| * | Clarify yaml hidden keys (jobs)docs/yaml-hidden-keysAchilleas Pipinellis2017-09-081-11/+17
* | | Merge branch 'uipolish-fix-2factor-warning' into 'master'Sean McGivern2017-09-082-6/+11
|\ \ \
| * | | Tweak column widths on two factor warning messagesJedidiah2017-09-082-6/+11
|/ / /
* | | Merge branch 'vue-eslint' into 'master'Phil Hughes2017-09-081-7/+18
|\ \ \
| * | | Adds a better explanation for alignment sectionFilipa Lacerda2017-09-081-7/+18
|/ / /
* | | Merge branch '37618-wrong-link-for-write-test-in-contributing-md' into 'master'Rémy Coutable2017-09-081-1/+1
|\ \ \
| * | | Fix wrong link in CONTRIBUTING.mdAchilleas Pipinellis2017-09-081-1/+1
* | | | Merge branch 'gpg' into 'master'Rémy Coutable2017-09-081-2/+2
|\ \ \ \
| * | | | update gpg_signed_commit to use 0xLONG format for gpg list keysKevin Pankonen2017-09-071-2/+2
* | | | | Merge branch 'bugfix/graph-friendly-notes-number' into 'master'Rémy Coutable2017-09-082-1/+7
|\ \ \ \ \
| * | | | | Print notes number explained.Vladislav Kaverin2017-09-082-1/+7
| | |_|_|/ | |/| | |
* | | | | Merge branch 'patch-18' into 'master'Rémy Coutable2017-09-081-2/+4
|\ \ \ \ \
| * | | | | clarify that only some Runner Executors have these security concernsBen Bodenmiller2017-09-061-2/+4
* | | | | | Merge branch 'docs/exclude-migration-path-jobs' into 'master'Rémy Coutable2017-09-081-0/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Exclude migration-paths job when executing docs-only jobsdocs/exclude-migration-path-jobsAchilleas Pipinellis2017-09-081-0/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'backport-issues-controller-changes' into 'master'Sean McGivern2017-09-086-18/+58
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into backport-issues-controller-changesbackport-issues-controller-changesBryce Johnson2017-09-07199-614/+3573
| |\ \ \ \ \
| * | | | | | Don't backport changes to nav_btns.Bryce Johnson2017-09-071-11/+2
| * | | | | | Backport getAllParams and other nav changes from service desk.Bryce Johnson2017-09-075-6/+52
| * | | | | | Move issues index variable setting to a methodSean McGivern2017-09-072-14/+17
* | | | | | | Merge branch '37569-fix-wrong-number-of-arguments-in-tree_helper-flatten_tree...Rémy Coutable2017-09-082-1/+21
|\ \ \ \ \ \ \
| * | | | | | | Fix a "Wrong number of arguments" error in TreeHelper#flatten_tree37569-fix-wrong-number-of-arguments-in-tree_helper-flatten_treeRémy Coutable2017-09-072-1/+21
* | | | | | | | Merge branch 'support-additional-colors' into 'master'Tim Zallmann2017-09-0810-72/+101
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | flipped series and when keysJose Ivan Vargas2017-09-071-2/+2
View Lorry Controller Status