summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Changed "Edit Group" subtab to "General" and moved itgroup-gear-setting-dropdown-to-tabJose Ivan Vargas2017-03-152-11/+7
| | | | | | to the first option inside said subtab. Also code cleanup
* Fixed some missing permission conditionsJose Ivan Vargas2017-03-142-11/+12
|
* Fixed haml_lint warning for the settings_head partialJose Ivan Vargas2017-03-142-2/+1
|
* Moved the gear settings dropdown in the group view to a tabJose Ivan Vargas2017-03-146-19/+28
|
* Merge branch 'syshook_documentation_updated' into 'master' Achilleas Pipinellis2017-03-141-2/+13
|\ | | | | | | | | Syshook documentation updated See merge request !9893
| * Syshook documentation updatedgpongelli2017-03-141-2/+13
|/
* Merge branch 'issue-boards-new-search-bar' into 'master' Filipa Lacerda2017-03-1420-195/+214
|\ | | | | | | | | | | | | Added filtered search bar to issue boards Closes #28312 See merge request !9757
| * added eventhub to emit update tokens eventissue-boards-new-search-barPhil Hughes2017-03-143-3/+9
| |
| * Use reduce instead of a forEachPhil Hughes2017-03-095-11/+34
| | | | | | | | | | Changed an isArray check to use -1 Added comment to boards search manager to explain behaviour
| * Removed previous filter codePhil Hughes2017-03-083-28/+3
| |
| * Fixed up boards filter spec due to CSS classes changingPhil Hughes2017-03-082-9/+8
| | | | | | | | Also fixed issue with Vue resource encoding + in search term
| * Hides on mobilePhil Hughes2017-03-081-1/+2
| |
| * Fixed eslint errorsPhil Hughes2017-03-082-2/+1
| |
| * Updated specsPhil Hughes2017-03-089-123/+86
| |
| * Handle clear search asyncPhil Hughes2017-03-081-0/+5
| |
| * Make changing the URL optional - future proof ourselves for the modal windowPhil Hughes2017-03-082-5/+9
| |
| * Stop droplab from destroying itself is handled asyncPhil Hughes2017-03-082-3/+10
| |
| * Updates the URLPhil Hughes2017-03-082-1/+2
| |
| * Changed storePhil Hughes2017-03-086-20/+40
| | | | | | | | Async updates the boards when searching
| * Added filtered search bar to issue boardsPhil Hughes2017-03-088-21/+37
| | | | | | | | Closes #28312
* | Merge branch 'google-protobuf-3.2.0.1' into 'master' Rémy Coutable2017-03-141-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Use google-protobuf 3.2.0.1 Closes #29084 See merge request !9932
| * | Use google-protobuf 3.2.0.1Jacob Vosmaer2017-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This sub-patch release extends support in pre-compiled libraries down to glibc 2.12. https://github.com/google/protobuf/issues/2783 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/29084
* | | Merge branch 'docs/include-gitlab-defaul-example-in-updates' into 'master' DJ Mountney2017-03-142-3/+24
|\ \ \ | | | | | | | | | | | | | | | | Include instructions to update /etc/default/gitlab See merge request !9925
| * | | Include instructions to update /etc/default/gitlabdocs/include-gitlab-defaul-example-in-updatesAchilleas Pipinellis2017-03-142-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We were missing some info on updating /etc/default/gitlab In particular, changes needed to be made in order for Pages to work, see https://gitlab.com/gitlab-org/gitlab-ce/issues/29372
* | | | Merge branch 'fix_relative_position_calculation' into 'master' Douwe Maan2017-03-144-36/+192
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix relative position calculation Closes #29269 See merge request !9837
| * | | | [Issue sorting]Addressed review commentsfix_relative_position_calculationValery Sizov2017-03-143-25/+119
| | | | |
| * | | | [Issue Sorting] Improve migrationValery Sizov2017-03-142-5/+3
| | | | |
| * | | | [Issue sorting] Filling positions preferable in the middleValery Sizov2017-03-142-24/+39
| | | | |
| * | | | Added migration to reset existing relative_position for issuesValery Sizov2017-03-141-0/+18
| | | | |
| * | | | Fix relative position calculationValery Sizov2017-03-142-8/+39
| | | | |
* | | | | Merge branch '28864-use-the-v4-api-from-the-frontend' into 'master' Sean McGivern2017-03-146-11/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Use the v4 API from the frontend" Closes #28864 See merge request !9714
| * | | | | Update API on frontend to use v428864-use-the-v4-api-from-the-frontendSam Rose2017-03-146-11/+11
| |/ / / / | | | | | | | | | | | | | | | Use options object to pass params for project endpoint
* | | | | Merge branch 'rs-capybara-screenshot-artifacts' into 'master' Kamil Trzciński2017-03-143-14/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store capybara screenshots as build artifacts Closes #13971 See merge request !7985
| * | | | | Don't disable capybara-screenshot in CI environmentrs-capybara-screenshot-artifactsRobert Speicher2016-12-082-12/+6
| | | | | |
| * | | | | Store capybara-screenshots folder as artifacts for RSpec and SpinachRobert Speicher2016-12-081-2/+6
| | | | | |
* | | | | | Merge branch '29389-fix-already-initialized-constants' into 'master' Robert Speicher2017-03-145-13/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove explicit `require` calls, and use `require_dependency` when needed Closes #29389 See merge request !9899
| * | | | | | Remove explicit `require` calls, and use `require_dependency` when needed29389-fix-already-initialized-constantsRémy Coutable2017-03-135-13/+6
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://guides.rubyonrails.org/autoloading_and_reloading_constants.html for more info. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch '29326-update-documentation' into 'master' Jacob Schatz2017-03-141-2/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds best practices regarding context and vue to documentation See merge request !9870
| * | | | | | Fix bad code example29326-update-documentationFilipa Lacerda2017-03-131-2/+2
| | | | | | |
| * | | | | | Merge branch 'master' into 29326-update-documentationFilipa Lacerda2017-03-1312-47/+54
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Resolve transient failure in spec/models/user_spec.rb Execute inflections initializer earlier Fix alignment of resolve discussion button Update templates with new CI variables Fix inconsistent deploy key documentation in UI
| * | | | | | | Fix code examples and add code highligthFilipa Lacerda2017-03-101-5/+4
| | | | | | | |
| * | | | | | | Merge branch 'master' into 29326-update-documentationFilipa Lacerda2017-03-108-56/+166
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Using guard clause and added more specs Changelog Fix GitHub Import for open PRs from a fork Add frequently used emojis back to awards menu
| * | | | | | | | Adds best practices regarding context and vue to documentationFilipa Lacerda2017-03-101-1/+32
| | | | | | | | |
* | | | | | | | | Merge branch 'patch-15' into 'master' Rémy Coutable2017-03-141-3/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update using_docker_images.md See merge request !9894
| * | | | | | | | | Update using_docker_images.mdszymon2017-03-141-3/+7
|/ / / / / / / / /
* | | | | | | | | Merge branch 'nonewline-parser' into 'master' Sean McGivern2017-03-145-7/+59
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take nonewline context into account in diff parser Closes #28128 and #22636 See merge request !9705
| * | | | | | | | | take nonewline context into account in diff parsermhasbini2017-03-135-7/+59
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix/gb/dashboard-commit-status-caching' into 'master' Sean McGivern2017-03-142-1/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve fragment caching rules at projects dashboard Closes #28364 See merge request !9895
| * | | | | | | | | Add changelog entry for project status caching fixfix/gb/dashboard-commit-status-cachingGrzegorz Bizon2017-03-141-0/+4
| | | | | | | | | |
| * | | | | | | | | Improve fragment caching rules at projects dashboardGrzegorz Bizon2017-03-131-1/+1
| | | | | | | | | |
View Lorry Controller Status