summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'project-webhooks-ui' into 'master' Jacob Schatz2016-04-284-87/+103
|\
| * Updated testsproject-webhooks-uiPhil Hughes2016-04-261-2/+2
| * Project webhooks updated UIPhil Hughes2016-04-263-85/+101
* | Merge branch 'project-deploy-keys-ui' into 'master' Jacob Schatz2016-04-287-104/+114
|\ \
| * | Updated tests for deploy keysproject-deploy-keys-uiPhil Hughes2016-04-253-14/+11
| * | Project deploy keys updated UIPhil Hughes2016-04-255-97/+110
* | | Merge branch 'scss-url-linters' into 'master' Jacob Schatz2016-04-281-2/+2
|\ \ \
| * | | Enable the UrlFormat and UrlQuotes SCSS Linters.Connor Shea2016-04-161-2/+2
* | | | Merge branch 'changelog-update' into 'master' Jacob Schatz2016-04-281-0/+1
|\ \ \ \
| * | | | Add Safari search box bug fix to changelogAnnabel Dunstone2016-04-271-0/+1
* | | | | Merge branch 'updated-triggers-ui' into 'master' Jacob Schatz2016-04-283-66/+63
|\ \ \ \ \
| * | | | | Updated triggers UIupdated-triggers-uiPhil Hughes2016-04-273-66/+63
| | |_|_|/ | |/| | |
* | | | | Merge branch 'project-group-ui' into 'master' Jacob Schatz2016-04-289-62/+89
|\ \ \ \ \
| * | | | | Changed settings icon color variableproject-group-uiPhil Hughes2016-04-272-2/+1
| * | | | | Fixed failing testsPhil Hughes2016-04-251-4/+2
| * | | | | Updated select box to match designPhil Hughes2016-04-252-1/+21
| * | | | | Updated project group sharing UIPhil Hughes2016-04-258-62/+72
| | |_|_|/ | |/| | |
* | | | | Merge branch 'todos-tests-fix' into 'master' Robert Speicher2016-04-281-2/+2
|\ \ \ \ \
| * | | | | Fix Todos testtodos-tests-fixAlfredo Sumaran2016-04-271-2/+2
* | | | | | Merge branch 'navigation-redesign' into 'master' Dmitriy Zaporozhets2016-04-283-7/+26
|\ \ \ \ \ \
| * | | | | | Reuse more popular colorsDmitriy Zaporozhets2016-04-282-4/+4
| * | | | | | Make layout navigation gray and fluidnavigation-redesignDmitriy Zaporozhets2016-04-282-4/+23
| * | | | | | Make application header light grayDmitriy Zaporozhets2016-04-281-2/+2
* | | | | | | Merge branch 'initd_gitlab_workhorse_rename' into 'master' Jacob Vosmaer (GitLab)2016-04-281-6/+6
|\ \ \ \ \ \ \
| * | | | | | | Replace gitlab-workhorse with GitLab Workhorse where appropriateinitd_gitlab_workhorse_renameAchilleas Pipinellis2016-04-281-6/+6
* | | | | | | | Merge branch 'allow-disabling-of-rack-attack' into 'master' Rémy Coutable2016-04-282-2/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Disable Rack Attack if admin disables it in config fileStan Hu2016-04-272-2/+5
* | | | | | | | Merge branch 'prepend-letter-v-to-workhorse-version-numbers' into 'master' Jacob Vosmaer (GitLab)2016-04-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Prepend letter v to GitLab Workhorse version numbersprepend-letter-v-to-workhorse-version-numbersKelvin2016-03-041-1/+1
* | | | | | | | | Merge branch 'fix/ci-skipped-status' into 'master' Rémy Coutable2016-04-284-75/+128
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Reorder asserts is ci commits specs for consistencyGrzegorz Bizon2016-04-281-1/+1
| * | | | | | | | | Add Changelog entry for build status canceled fixGrzegorz Bizon2016-04-281-0/+1
| * | | | | | | | | Add tests exercising builds scheduler after cancelGrzegorz Bizon2016-04-281-0/+18
| * | | | | | | | | Refactor ci commit specs by adding context blocksGrzegorz Bizon2016-04-281-77/+85
| * | | | | | | | | Render canceled status if any of the jobs canceledGrzegorz Bizon2016-04-272-1/+27
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'use-remote-ip-for-akismet' into 'master' Rémy Coutable2016-04-284-5/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use ActionDispatch Remote IP for Akismet checkingStan Hu2016-04-274-5/+14
| |/ / / / / / / /
* | | | | | | | | Merge branch 'label_feature_proposal' into 'master' Rémy Coutable2016-04-281-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix links to core team pageAchilleas Pipinellis2016-04-281-5/+4
| * | | | | | | | | Users can use the feature proposal label inside the issuelabel_feature_proposalAchilleas Pipinellis2016-04-281-2/+3
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'admin-email-frequency' into 'master' Jacob Vosmaer2016-04-282-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Send 'admin emails' weekly, not dailyJacob Vosmaer2016-04-262-3/+3
* | | | | | | | | | Merge branch 'fix/docker-in-docker-ci-documentation' into 'master' Achilleas Pipinellis2016-04-281-20/+63
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Copyedit `using_docker_build.md` and fix linksfix/docker-in-docker-ci-documentationAchilleas Pipinellis2016-04-281-13/+24
| * | | | | | | | | | Update using_docker_build.md, clarify the 'privileged' mode requirementTomasz Maczukin2016-04-251-16/+48
* | | | | | | | | | | Merge branch 'fix-github-enterprise-imports' into 'master' Rémy Coutable2016-04-288-10/+101
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fixes for review of GitHub Enterprise backport changesStan Hu2016-04-262-4/+4
| * | | | | | | | | | Backport GitHub Enterprise import support from EEStan Hu2016-04-268-10/+101
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'add-js-prefix-to-user-tab-classes' into 'master' Jacob Schatz2016-04-272-4/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Add JS prefix to user tab classesKarlo Soriano2016-04-262-4/+4
| | |_|/ / / / / / | |/| | | | | | |