Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use `:empty_project` where possible in helper specsrs-empty_project-helpers | Robert Speicher | 2017-01-25 | 14 | -40/+41 |
| | |||||
* | Merge branch '26447-fix-tab-list-order' into 'master' | Clement Ho | 2017-01-24 | 3 | -4/+19 |
|\ | | | | | | | | | | | | | Fixed tab index order on branch commits list page Closes #26447 See merge request !8489 | ||||
| * | Add proper webkit prefix for .flex-container-block style definition | Ryan Harris | 2017-01-24 | 1 | -1/+1 |
| | | |||||
| * | Update prefixes for flexbox style definitions | Ryan Harris | 2017-01-24 | 1 | -3/+3 |
| | | |||||
| * | Added class to .row-content-block to allow custom flexbox styling | Ryan Harris | 2017-01-24 | 2 | -7/+6 |
| | | |||||
| * | Change the row-content-block menu on the commits page to a flexbox container | Ryan Harris | 2017-01-24 | 1 | -2/+12 |
| | | |||||
| * | Fixed tab index order on branch commits list page | Ryan Harris | 2017-01-24 | 3 | -2/+8 |
| | | |||||
* | | Merge branch 'add-metrics-initializer-spec' into 'master' | Yorick Peterse | 2017-01-24 | 2 | -104/+131 |
|\ \ | | | | | | | | | | | | | Add metric initializer spec See merge request !8714 | ||||
| * | | Add metric initializer specadd-metrics-initializer-spec | Sean McGivern | 2017-01-24 | 2 | -104/+131 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An empty file in one of the instrumented directories will cause the app to fail to start when metrics are enabled. Metrics aren't enabled by default in development or test. We could handle the empty file case explicitly, but a file could still not define the constant it is expected to, so instead run the initializer manually in a spec and check that it succeeds. | ||||
* | | | Merge branch '25780-reveal-variables-button-may-overrun-width-of-screen' ↵ | Fatih Acet | 2017-01-24 | 1 | -1/+25 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Reveal Variables button may overrun width of screen" Closes #25780 See merge request !8221 | ||||
| * | | | Shush scss_lint.25780-reveal-variables-button-may-overrun-width-of-screen | Bryce Johnson | 2017-01-24 | 1 | -1/+2 |
| | | | | |||||
| * | | | Fix size of variable-value column for small screens. | Bryce Johnson | 2017-01-23 | 1 | -0/+9 |
| | | | | |||||
| * | | | Make variables table border consistent across viewport widths. | Bryce Johnson | 2017-01-23 | 1 | -0/+3 |
| | | | | |||||
| * | | | Force variable key cell to stay small and wrap text. | Bryce Johnson | 2017-01-23 | 1 | -1/+12 |
| | | | | |||||
* | | | | Merge branch '26468-fix-users-sort-in-admin-area' into 'master' | Douwe Maan | 2017-01-24 | 3 | -19/+36 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing sort of Users so that users who never logged in will be displayed last Closes #26468 See merge request !8637 | ||||
| * | | | | Fixing sort of Users so that users who never logged in will be displayed last | Poornima M | 2017-01-24 | 3 | -19/+36 |
| | | | | | | | | | | | | | | | | | | | | Adding changelog entry | ||||
* | | | | | Merge branch 'misalinged-discussion-with-no-avatar-26854' into 'master' | Fatih Acet | 2017-01-24 | 2 | -0/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds avatar for discussion note Closes #26854 See merge request !8734 | ||||
| * | | | | | adds changelogmisalinged-discussion-with-no-avatar-26854 | Nur Rony | 2017-01-24 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | adds avatar for discussion note | Nur Rony | 2017-01-24 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | Merge branch 'broken_iamge_when_doing_offline_update_check(help_page)' into ↵ | Clement Ho | 2017-01-24 | 4 | -1/+19 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' fix broken image when doing offline update check(help page) Closes #25982 See merge request !8355 | ||||
| * | | | | | hide the version check image if internet connection is broken | Ken Ding | 2017-01-25 | 4 | -1/+19 |
| | | | | | | |||||
* | | | | | | Merge branch '26445-accessible-piplelines-buttons' into 'master' | Fatih Acet | 2017-01-24 | 5 | -26/+44 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update buttons on pipelines page to be more accessible Closes #26445 See merge request !8561 | ||||
| * | | | | | | Improve button accessibility on pipelines page26445-accessible-piplelines-buttons | Eric Eastwood | 2017-01-23 | 5 | -26/+44 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'add-existence-checks-in-backported-migrations-ce' into 'master' | Robert Speicher | 2017-01-24 | 2 | -2/+16 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the time estimate migrations reversible See merge request !8749 | ||||
| * | | | | | | | Make the time estimate migrations reversibleadd-existence-checks-in-backported-migrations-ce | Rémy Coutable | 2017-01-24 | 2 | -2/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | | Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' | Robert Speicher | 2017-01-24 | 13 | -106/+141 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dont persist application settings in test env See merge request !8715 | ||||
| * | | | | | | | | Rescue from ActiveRecord::UnknownAttributeError and fallback to fake settingsdont-persist-application-settings-in-test-env-bis | Rémy Coutable | 2017-01-23 | 2 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | Revert "Merge branch 'revert-9cac0317' into 'master' " | Grzegorz Bizon | 2017-01-23 | 12 | -104/+141 |
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c20934869f7dc8cfbdbafb6ecb7b1305452c9e8a, reversing changes made to 4b7ec44b91e0571d209c790d54947ba1756dac0e. | ||||
* | | | | | | | | Merge branch '24923_nested_tasks' into 'master' | Sean McGivern | 2017-01-24 | 5 | -5/+89 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix nested tasks in ordered list Closes #24923 See merge request !8626 | ||||
| * | | | | | | | | fix nested tasks in ordered list | Jarka Kadlecova | 2017-01-24 | 5 | -5/+89 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'patch-12' into 'master' | Rémy Coutable | 2017-01-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in link to "Services Templates" page. See merge request !8709 | ||||
| * | | | | | | | | Fix typo in link to "Services Templates" page. | Arnd | 2017-01-23 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'docs/conflict-editor' into 'master' | Achilleas Pipinellis | 2017-01-24 | 2 | -0/+12 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for resolve conflicts editor See merge request !8748 | ||||
| * | | | | | | | | Add docs for resolve conflicts editor | Achilleas Pipinellis | 2017-01-24 | 2 | -0/+12 |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | | Merge branch 'docs/2fa-cleanup' into 'master' | Achilleas Pipinellis | 2017-01-24 | 11 | -215/+224 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge the two 2FA docs into one See merge request !8747 | ||||
| * | | | | | | | | Merge the two 2FA docs into one | Achilleas Pipinellis | 2017-01-24 | 11 | -215/+224 |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | | Merge branch 'docs/issues-due-dates' into 'master' | Achilleas Pipinellis | 2017-01-24 | 9 | -0/+38 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Add due dates docs See merge request !8744 | ||||
| * | | | | | | | Add due dates docs | Achilleas Pipinellis | 2017-01-24 | 9 | -0/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | | Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into ↵ | Sean McGivern | 2017-01-24 | 9 | -4/+235 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Allows to search within project by commit's hash #24833 Closes #24833 See merge request !8028 | ||||
| * | | | | | | | Search feature: redirects to commit page if query is commit sha and only ↵ | YarNayar | 2017-01-24 | 5 | -1/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit found See !8028 and #24833 | ||||
| * | | | | | | | Allows to search within project by commit's hash | YarNayar | 2017-01-24 | 6 | -4/+179 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was proposed in #24833 | ||||
* | | | | | | | | Merge branch 'zj-mattermost-api-update' into 'master' | Grzegorz Bizon | 2017-01-24 | 3 | -8/+18 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small update to the Mattermost API See merge request !8712 | ||||
| * | | | | | | | | Small update to the Mattermost APIzj-mattermost-api-update | Z.J. van de Weg | 2017-01-24 | 3 | -8/+18 |
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes make it possible to wrap multiple API requests in one session. | ||||
* | | | | | | | | Merge branch 'grapify-deploy-keys' into 'master' | Rémy Coutable | 2017-01-24 | 2 | -16/+10 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify all endpoints of the deploy keys API See merge request !8721 | ||||
| * | | | | | | | | Grapify all endpoints of the deploy keys APIgrapify-deploy-keys | Robert Schilling | 2017-01-23 | 2 | -16/+10 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'patch-12' into 'master' | James Lopez | 2017-01-24 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix hash of ruby in update documentation See merge request !8735 | ||||
| * | | | | | | | Fix hash of ruby archive in documentation | Maximilien Cuony | 2017-01-24 | 2 | -2/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'backport-ee-1051-approvals-reset-on-closed-mr' into 'master' | Sean McGivern | 2017-01-24 | 4 | -39/+52 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport EE changes on approvals reset for closed MRs See merge request !8559 | ||||
| * | | | | | | | Backport EE changes on approvals reset for closed MRsbackport-ee-1051-approvals-reset-on-closed-mr | Oswaldo Ferreira | 2017-01-23 | 4 | -39/+52 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'docs/confidential-issues' into 'master' | Achilleas Pipinellis | 2017-01-24 | 9 | -14/+87 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for confidential issues Closes #14397 See merge request !8741 |