summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove use of wait_for_ajax since jQuery was removedsh-fix-ajax-spec-failureStan Hu2016-10-251-3/+0
* Merge branch 'docs/fog-storage-drivers' into 'master' Achilleas Pipinellis2016-10-250-0/+0
|\
| * Specify which Fog storage drivers are imported by default in backup_restore.mdbradjones1/gitlab-ce-patch-3Brad Jones2016-10-251-2/+5
* | Merge branch 'bradjones1/gitlab-ce-patch-3' into 'master' Achilleas Pipinellis2016-10-251-2/+5
|\ \
| * | Specify which Fog storage drivers are imported by default in backup_restore.mdBrad Jones2016-10-241-2/+5
* | | Merge branch 'itchy-trigger-finger-on-issues-search' into 'master' Fatih Acet2016-10-252-3/+54
|\ \ \
| * | | Ensure search val is defined.itchy-trigger-finger-on-issues-searchBryce Johnson2016-10-251-1/+1
| * | | Ensure cursor is applied to end of issues search input.Bryce Johnson2016-10-251-2/+16
| * | | Increase debounce wait on issues search execution.Bryce Johnson2016-10-252-3/+40
* | | | Merge branch 'troubleshoot-migration-paths' into 'master' Stan Hu2016-10-251-1/+5
|\ \ \ \
| * | | | Improve redis config tasks for migration paths jobtroubleshoot-migration-pathsGrzegorz Bizon2016-10-251-4/+5
| * | | | Keep the new resque.yml aside and use it once we've checked out masterRémy Coutable2016-10-251-0/+3
* | | | | Merge branch 'fix-events-api' into 'master' Rémy Coutable2016-10-252-2/+25
|\ \ \ \ \
| * | | | | Make events order spec deterministic, create only 3 record instead of 5, expl...Airat Shigapov2016-10-241-8/+10
| * | | | | Rewrite events order spec to simulate wrong order without changing idsAirat Shigapov2016-10-241-9/+10
| * | | | | Add test for events order in APIAirat Shigapov2016-10-241-0/+20
| * | | | | Get rid of extra .page callAirat Shigapov2016-10-241-2/+1
| * | | | | Fix events order in user contributions APIAirat Shigapov2016-10-241-1/+2
* | | | | | Merge branch 'project-cache-worker-scheduling' into 'master' Rémy Coutable2016-10-256-18/+77
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Don't schedule ProjectCacheWorker unless neededproject-cache-worker-schedulingYorick Peterse2016-10-256-18/+77
* | | | | | Merge branch 'sh-optimize-label-finder' into 'master' 23794-hovers-don-t-go-awayStan Hu2016-10-252-1/+2
|\ \ \ \ \ \
| * | | | | | Reduce overhead of LabelFinder by avoiding #presence callsh-optimize-label-finderStan Hu2016-10-252-1/+2
* | | | | | | Merge branch 'patch-7' into 'master' Rémy Coutable2016-10-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Changing gitlab-shell version to 3.6.6 instead of 3.6.3, later on the upgrade...Tobias Genberg2016-10-191-1/+1
* | | | | | | | Merge branch 'temporarily-revert-appending-templates-before-long-term-ux-fix'...Alfredo Sumaran2016-10-253-14/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Removed append logictemporarily-revert-appending-templates-before-long-term-ux-fixLuke Bennett2016-10-213-14/+7
* | | | | | | | | Merge branch 'tidy-up-pipeline-js' into 'master' Alfredo Sumaran2016-10-252-22/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | converted last method to jQuerytidy-up-pipeline-jsLuke Bennett2016-10-202-13/+20
| * | | | | | | | | Tidied up pipelines.js.es6 and removed jQuery where acceptable.Luke "Jared" Bennett2016-10-201-11/+13
* | | | | | | | | | Merge branch '22743-issue-tooltip-will-not-disappear-going-back-to-previous-p...Fatih Acet2016-10-253-5/+10
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into 22743-issue-tooltip-will-not-disappear-going-back-...Linus G Thiel2016-10-25199-862/+2162
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Close any open tooltips before page:fetchLinus G Thiel2016-10-203-5/+10
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'improve-grape-dsl-rules' into 'master' Robert Speicher2016-10-253-6/+98
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Improve copyimprove-grape-dsl-rulesRémy Coutable2016-10-171-2/+2
| * | | | | | | | | | | More improvementsRémy Coutable2016-10-131-3/+3
| * | | | | | | | | | | Fix typoRémy Coutable2016-10-131-1/+1
| * | | | | | | | | | | Move the Grape DSL part from Doc styleguide to API styleguideRémy Coutable2016-10-132-11/+43
| * | | | | | | | | | | Add an API styleguideRémy Coutable2016-10-132-0/+60
* | | | | | | | | | | | Merge branch 'add-test-for-snippet-download' into 'master' Rémy Coutable2016-10-251-73/+83
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add missing tests for download snippetSemyon Pupkov2016-10-131-73/+83
* | | | | | | | | | | | | Merge branch 'enable-scss-lint-single-line-per-selector' into 'master' Annabel Dunstone Gray2016-10-2542-104/+247
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Enable SingleLinePerSelector in scss-lintenable-scss-lint-single-line-per-selectorClement Ho2016-10-2442-104/+247
* | | | | | | | | | | | | Merge branch 'board-dragging-disabled' into 'master' Sean McGivern2016-10-253-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Stop unauthized users dragging on issue boardsboard-dragging-disabledPhil Hughes2016-10-253-2/+7
* | | | | | | | | | | | | | Merge branch '23372-fix-ce-to-ee-merge-check-task' into 'master' Robert Speicher2016-10-255-102/+278
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Disable Rails/Output cop since it makes no sense here23372-fix-ce-to-ee-merge-check-taskRémy Coutable2016-10-241-0/+1
| * | | | | | | | | | | | | Use File.write instead of File.open + File#writeRémy Coutable2016-10-241-1/+1
| * | | | | | | | | | | | | Don't print out implementation detail stepRémy Coutable2016-10-241-1/+1
| * | | | | | | | | | | | | Change the approach to check if patches apply cleanlyRémy Coutable2016-10-215-102/+277
* | | | | | | | | | | | | | Merge branch 'show-commit-status-from-source-project' into 'master' Douwe Maan2016-10-255-5/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status