summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use `:empty_project` where possible in helper specsrs-empty_project-helpersRobert Speicher2017-01-2514-40/+41
|
* Merge branch '26447-fix-tab-list-order' into 'master' Clement Ho2017-01-243-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 definitionRyan Harris2017-01-241-1/+1
| |
| * Update prefixes for flexbox style definitionsRyan Harris2017-01-241-3/+3
| |
| * Added class to .row-content-block to allow custom flexbox stylingRyan Harris2017-01-242-7/+6
| |
| * Change the row-content-block menu on the commits page to a flexbox containerRyan Harris2017-01-241-2/+12
| |
| * Fixed tab index order on branch commits list pageRyan Harris2017-01-243-2/+8
| |
* | Merge branch 'add-metrics-initializer-spec' into 'master' Yorick Peterse2017-01-242-104/+131
|\ \ | | | | | | | | | | | | Add metric initializer spec See merge request !8714
| * | Add metric initializer specadd-metrics-initializer-specSean McGivern2017-01-242-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 Acet2017-01-241-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-screenBryce Johnson2017-01-241-1/+2
| | | |
| * | | Fix size of variable-value column for small screens.Bryce Johnson2017-01-231-0/+9
| | | |
| * | | Make variables table border consistent across viewport widths.Bryce Johnson2017-01-231-0/+3
| | | |
| * | | Force variable key cell to stay small and wrap text.Bryce Johnson2017-01-231-1/+12
| | | |
* | | | Merge branch '26468-fix-users-sort-in-admin-area' into 'master' Douwe Maan2017-01-243-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 lastPoornima M2017-01-243-19/+36
| | | | | | | | | | | | | | | | | | | | Adding changelog entry
* | | | | Merge branch 'misalinged-discussion-with-no-avatar-26854' into 'master' Fatih Acet2017-01-242-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds avatar for discussion note Closes #26854 See merge request !8734
| * | | | | adds changelogmisalinged-discussion-with-no-avatar-26854Nur Rony2017-01-241-0/+4
| | | | | |
| * | | | | adds avatar for discussion noteNur Rony2017-01-241-0/+3
| | | | | |
* | | | | | Merge branch 'broken_iamge_when_doing_offline_update_check(help_page)' into ↵Clement Ho2017-01-244-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 brokenKen Ding2017-01-254-1/+19
| | | | | |
* | | | | | Merge branch '26445-accessible-piplelines-buttons' into 'master' Fatih Acet2017-01-245-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-buttonsEric Eastwood2017-01-235-26/+44
| | | | | | |
* | | | | | | Merge branch 'add-existence-checks-in-backported-migrations-ce' into 'master' Robert Speicher2017-01-242-2/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the time estimate migrations reversible See merge request !8749
| * | | | | | | Make the time estimate migrations reversibleadd-existence-checks-in-backported-migrations-ceRémy Coutable2017-01-242-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' Robert Speicher2017-01-2413-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-bisRémy Coutable2017-01-232-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | Revert "Merge branch 'revert-9cac0317' into 'master' "Grzegorz Bizon2017-01-2312-104/+141
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c20934869f7dc8cfbdbafb6ecb7b1305452c9e8a, reversing changes made to 4b7ec44b91e0571d209c790d54947ba1756dac0e.
* | | | | | | | Merge branch '24923_nested_tasks' into 'master' Sean McGivern2017-01-245-5/+89
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix nested tasks in ordered list Closes #24923 See merge request !8626
| * | | | | | | | fix nested tasks in ordered listJarka Kadlecova2017-01-245-5/+89
| | | | | | | | |
* | | | | | | | | Merge branch 'patch-12' into 'master' Rémy Coutable2017-01-241-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in link to "Services Templates" page. See merge request !8709
| * | | | | | | | Fix typo in link to "Services Templates" page.Arnd2017-01-231-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'docs/conflict-editor' into 'master' Achilleas Pipinellis2017-01-242-0/+12
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for resolve conflicts editor See merge request !8748
| * | | | | | | | Add docs for resolve conflicts editorAchilleas Pipinellis2017-01-242-0/+12
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'docs/2fa-cleanup' into 'master' Achilleas Pipinellis2017-01-2411-215/+224
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge the two 2FA docs into one See merge request !8747
| * | | | | | | | Merge the two 2FA docs into oneAchilleas Pipinellis2017-01-2411-215/+224
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'docs/issues-due-dates' into 'master' Achilleas Pipinellis2017-01-249-0/+38
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Add due dates docs See merge request !8744
| * | | | | | | Add due dates docsAchilleas Pipinellis2017-01-249-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into ↵Sean McGivern2017-01-249-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 ↵YarNayar2017-01-245-1/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit found See !8028 and #24833
| * | | | | | | Allows to search within project by commit's hashYarNayar2017-01-246-4/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was proposed in #24833
* | | | | | | | Merge branch 'zj-mattermost-api-update' into 'master' Grzegorz Bizon2017-01-243-8/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small update to the Mattermost API See merge request !8712
| * | | | | | | | Small update to the Mattermost APIzj-mattermost-api-updateZ.J. van de Weg2017-01-243-8/+18
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes make it possible to wrap multiple API requests in one session.
* | | | | | | | Merge branch 'grapify-deploy-keys' into 'master' Rémy Coutable2017-01-242-16/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify all endpoints of the deploy keys API See merge request !8721
| * | | | | | | | Grapify all endpoints of the deploy keys APIgrapify-deploy-keysRobert Schilling2017-01-232-16/+10
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'patch-12' into 'master' James Lopez2017-01-242-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Fix hash of ruby in update documentation See merge request !8735
| * | | | | | | Fix hash of ruby archive in documentationMaximilien Cuony2017-01-242-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'backport-ee-1051-approvals-reset-on-closed-mr' into 'master' Sean McGivern2017-01-244-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-mrOswaldo Ferreira2017-01-234-39/+52
| | | | | | | |
* | | | | | | | Merge branch 'docs/confidential-issues' into 'master' Achilleas Pipinellis2017-01-249-14/+87
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for confidential issues Closes #14397 See merge request !8741