Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'scss-url-linters' into 'master' | Jacob Schatz | 2016-04-28 | 1 | -2/+2 |
|\ | |||||
| * | Enable the UrlFormat and UrlQuotes SCSS Linters. | Connor Shea | 2016-04-16 | 1 | -2/+2 |
* | | Merge branch 'changelog-update' into 'master' | Jacob Schatz | 2016-04-28 | 1 | -0/+1 |
|\ \ | |||||
| * | | Add Safari search box bug fix to changelog | Annabel Dunstone | 2016-04-27 | 1 | -0/+1 |
* | | | Merge branch 'updated-triggers-ui' into 'master' | Jacob Schatz | 2016-04-28 | 3 | -66/+63 |
|\ \ \ | |||||
| * | | | Updated triggers UIupdated-triggers-ui | Phil Hughes | 2016-04-27 | 3 | -66/+63 |
* | | | | Merge branch 'project-group-ui' into 'master' | Jacob Schatz | 2016-04-28 | 9 | -62/+89 |
|\ \ \ \ | |||||
| * | | | | Changed settings icon color variableproject-group-ui | Phil Hughes | 2016-04-27 | 2 | -2/+1 |
| * | | | | Fixed failing tests | Phil Hughes | 2016-04-25 | 1 | -4/+2 |
| * | | | | Updated select box to match design | Phil Hughes | 2016-04-25 | 2 | -1/+21 |
| * | | | | Updated project group sharing UI | Phil Hughes | 2016-04-25 | 8 | -62/+72 |
* | | | | | Merge branch 'todos-tests-fix' into 'master' | Robert Speicher | 2016-04-28 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix Todos testtodos-tests-fix | Alfredo Sumaran | 2016-04-27 | 1 | -2/+2 |
* | | | | | | Merge branch 'navigation-redesign' into 'master' | Dmitriy Zaporozhets | 2016-04-28 | 3 | -7/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Reuse more popular colors | Dmitriy Zaporozhets | 2016-04-28 | 2 | -4/+4 |
| * | | | | | | Make layout navigation gray and fluidnavigation-redesign | Dmitriy Zaporozhets | 2016-04-28 | 2 | -4/+23 |
| * | | | | | | Make application header light gray | Dmitriy Zaporozhets | 2016-04-28 | 1 | -2/+2 |
* | | | | | | | Merge branch 'initd_gitlab_workhorse_rename' into 'master' | Jacob Vosmaer (GitLab) | 2016-04-28 | 1 | -6/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Replace gitlab-workhorse with GitLab Workhorse where appropriateinitd_gitlab_workhorse_rename | Achilleas Pipinellis | 2016-04-28 | 1 | -6/+6 |
* | | | | | | | | Merge branch 'allow-disabling-of-rack-attack' into 'master' | Rémy Coutable | 2016-04-28 | 2 | -2/+5 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Disable Rack Attack if admin disables it in config file | Stan Hu | 2016-04-27 | 2 | -2/+5 |
* | | | | | | | | Merge branch 'prepend-letter-v-to-workhorse-version-numbers' into 'master' | Jacob Vosmaer (GitLab) | 2016-04-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Prepend letter v to GitLab Workhorse version numbersprepend-letter-v-to-workhorse-version-numbers | Kelvin | 2016-03-04 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'fix/ci-skipped-status' into 'master' | Rémy Coutable | 2016-04-28 | 4 | -75/+128 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Reorder asserts is ci commits specs for consistency | Grzegorz Bizon | 2016-04-28 | 1 | -1/+1 |
| * | | | | | | | | | Add Changelog entry for build status canceled fix | Grzegorz Bizon | 2016-04-28 | 1 | -0/+1 |
| * | | | | | | | | | Add tests exercising builds scheduler after cancel | Grzegorz Bizon | 2016-04-28 | 1 | -0/+18 |
| * | | | | | | | | | Refactor ci commit specs by adding context blocks | Grzegorz Bizon | 2016-04-28 | 1 | -77/+85 |
| * | | | | | | | | | Render canceled status if any of the jobs canceled | Grzegorz Bizon | 2016-04-27 | 2 | -1/+27 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'use-remote-ip-for-akismet' into 'master' | Rémy Coutable | 2016-04-28 | 4 | -5/+14 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use ActionDispatch Remote IP for Akismet checking | Stan Hu | 2016-04-27 | 4 | -5/+14 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'label_feature_proposal' into 'master' | Rémy Coutable | 2016-04-28 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix links to core team page | Achilleas Pipinellis | 2016-04-28 | 1 | -5/+4 |
| * | | | | | | | | | Users can use the feature proposal label inside the issuelabel_feature_proposal | Achilleas Pipinellis | 2016-04-28 | 1 | -2/+3 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'admin-email-frequency' into 'master' | Jacob Vosmaer | 2016-04-28 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Send 'admin emails' weekly, not daily | Jacob Vosmaer | 2016-04-26 | 2 | -3/+3 |
* | | | | | | | | | | Merge branch 'fix/docker-in-docker-ci-documentation' into 'master' | Achilleas Pipinellis | 2016-04-28 | 1 | -20/+63 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Copyedit `using_docker_build.md` and fix linksfix/docker-in-docker-ci-documentation | Achilleas Pipinellis | 2016-04-28 | 1 | -13/+24 |
| * | | | | | | | | | | Update using_docker_build.md, clarify the 'privileged' mode requirement | Tomasz Maczukin | 2016-04-25 | 1 | -16/+48 |
* | | | | | | | | | | | Merge branch 'fix-github-enterprise-imports' into 'master' | Rémy Coutable | 2016-04-28 | 8 | -10/+101 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fixes for review of GitHub Enterprise backport changes | Stan Hu | 2016-04-26 | 2 | -4/+4 |
| * | | | | | | | | | | Backport GitHub Enterprise import support from EE | Stan Hu | 2016-04-26 | 8 | -10/+101 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'add-js-prefix-to-user-tab-classes' into 'master' | Jacob Schatz | 2016-04-27 | 2 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Add JS prefix to user tab classes | Karlo Soriano | 2016-04-26 | 2 | -4/+4 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'trigger-query-string' into 'master' | Achilleas Pipinellis | 2016-04-27 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add API doc example with query string for triggering build | David de Boer | 2016-04-27 | 1 | -0/+6 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'fix-operations-doc' into 'master' | Achilleas Pipinellis | 2016-04-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Sidekiq MemoryKiller sends a `SIGKILL` signal, not `SIGTERM`fix-operations-doc | Rémy Coutable | 2016-04-26 | 1 | -1/+1 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'project-dropdown-tests' into 'master' | Jacob Schatz | 2016-04-27 | 1 | -0/+27 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Project title dropdown testsproject-dropdown-tests | Phil Hughes | 2016-04-26 | 1 | -0/+27 |
| | |_|_|_|_|_|/ / | |/| | | | | | | |