summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove limited container on file viewfile-view-containerAnnabel Dunstone Gray2017-04-071-3/+3
|
* Merge branch 'clarify-mr-with-someone' into 'master' Stan Hu2017-04-071-5/+14
|\ | | | | | | | | Clarify what an MR needs to be 'with' a maintainer See merge request !10544
| * Clarify what an MR needs to be 'with' a maintainerclarify-mr-with-someoneSean McGivern2017-04-071-5/+14
| |
* | Merge branch 'safari-svg-bug' into 'master' Jacob Schatz2017-04-072-2/+2
|\ \ | | | | | | | | | | | | Give explicit height to SVG icons for Safari See merge request !10550
| * | Give explicit height to SVG icons for SafariAnnabel Dunstone Gray2017-04-072-2/+2
| | |
* | | Merge branch 'dm-wait-for-pipeline' into 'master' Stan Hu2017-04-071-0/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Wait for AJAX requests to complete so they don't blow up if they are only handle… Closes #30633 See merge request !10559
| * | | Actually include WaitForAjax!Douwe Maan2017-04-071-0/+1
| | | |
| * | | Wait for AJAX requests to complete so they don't blow up if they are only ↵Douwe Maan2017-04-071-0/+8
| | | | | | | | | | | | | | | | handled after DatabaseCleaner has already run
* | | | Merge branch 'adam-finish-5993-closed-issuable' into 'master' Douwe Maan2017-04-0718-153/+354
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add indication for closed or merged issuables in GFM Closes #1369 See merge request !9462
| * | | | Add indication for closed or merged issuables in GFMadam-finish-5993-closed-issuableAdam Buckland2017-04-0718-153/+354
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: for issues that are closed, the links will now show '[closed]' following the issue number. This is done as post-process after the markdown has been loaded from the cache as the status of the issue may change between the cache being populated and the content being displayed. In order to avoid N+1 queries problem when rendering notes ObjectRenderer populates the cache of referenced issuables for all notes at once, before the post processing phase. As a part of this change, the Banzai BaseParser#grouped_objects_for_nodes method has been refactored to return a Hash utilising the node itself as the key, since this was a common pattern of usage for this method.
* | | | | Merge branch 'activity-feed-user-name' into 'master' Annabel Dunstone Gray2017-04-076-4/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Put back usernames in activity and profile feed See merge request !10539
| * | | | | Put back usernames in activity and profile feedAnnabel Dunstone Gray2017-04-076-4/+8
| | |_|/ / | |/| | |
* | | | | Merge branch 'feature/add-rake-task-prints-storage-config-in-toml' into ↵Robert Speicher2017-04-074-0/+52
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add rake task that prints TOML storage configuration Closes gitaly#173 See merge request !10448
| * | | | | Add rake task that prints TOML storage configurationfeature/add-rake-task-prints-storage-config-in-tomlAhmad Sherif2017-04-044-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#173
* | | | | | Merge branch '30588-fix-javascript-sourcemaps-w-chrome-breakpoints' into ↵Jacob Schatz2017-04-073-33/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Upgrade webpack and webpack-dev-server to latest Closes #30588 and #28438 See merge request !10552
| * | | | | | add CHANGELOG.md entry for !10522Mike Greiling2017-04-071-0/+4
| | | | | | |
| * | | | | | upgrade webpack-dev-server to fix issues with SockJS causing odd reload ↵Mike Greiling2017-04-072-36/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | behavior in firefox https://github.com/webpack/webpack-dev-server/issues/762
| * | | | | | upgrade webpack to v2.3.3 to resolve sourcemap issuesMike Greiling2017-04-072-25/+45
| | | | | | |
* | | | | | | Merge branch 'title-change-icon' into 'master' Annabel Dunstone Gray2017-04-071-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Update MR title change icon See merge request !10540
| * | | | | | Update MR title change iconAnnabel Dunstone Gray2017-04-071-1/+1
|/ / / / / /
* | | | | | Merge branch 'test-failure-fix' into 'master' Stan Hu2017-04-071-564/+457
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | Revert yarn.lock file changes Closes #30627 See merge request !10558
| * | | | Revert yarn.lock file changesPhil Hughes2017-04-071-564/+457
| | |/ / | |/| |
* | | | Merge branch '30151-fix-vue-production-warnings' into 'master' Alfredo Sumaran2017-04-077-24/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Vue from main bundle and disable production warnings Closes #30151 See merge request !10458
| * | | | Remove Vue from main bundle and disable production warningsMike Greiling2017-04-077-24/+17
|/ / / /
* | | | Merge branch ↵Sean McGivern2017-04-0716-25/+186
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 'dosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation-with-quick-ui' into 'master' Add "engineering" UI for Pipeline Schedule See merge request !10533
| * | | Add ref and active to import/export configSean McGivern2017-04-071-0/+2
| | | |
| * | | Fix last spec failureKamil Trzcinski2017-04-071-1/+6
| | | |
| * | | Fix spec failureKamil Trzcinski2017-04-071-1/+1
| | | |
| * | | Yet, another errorsdosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation-with-quick-uiKamil Trzcinski2017-04-072-2/+5
| | | |
| * | | Another round of code reviewKamil Trzcinski2017-04-072-4/+10
| | | |
| * | | Fix changelogKamil Trzcinski2017-04-071-2/+2
| | | |
| * | | Fix test failuresKamil Trzcinski2017-04-074-4/+6
| | | |
| * | | Simplify ifKamil Trzcinski2017-04-071-1/+1
| | | |
| * | | Update code to remove no longer needed changesKamil Trzcinski2017-04-072-7/+1
| | | |
| * | | Update migrationsKamil Trzcinski2017-04-074-45/+14
| | | |
| * | | Update tests to cover trigger scheduleKamil Trzcinski2017-04-075-32/+82
| | | |
| * | | Fix ref referenceKamil Trzcinski2017-04-0710-36/+119
| | | |
| * | | N/A to None. Revert validates from validates_presence_of.Shinya Maeda2017-04-072-2/+2
| | | |
| * | | create_params and update_params into trigger_paramsShinya Maeda2017-04-071-11/+4
| | | |
| * | | Add def trigger_schedule in Trigger. Use persisted? for checling existanceShinya Maeda2017-04-074-3/+5
| | | |
| * | | before_create :set_project. Now TriggerSchedule saves project from parentShinya Maeda2017-04-072-5/+5
| | | |
| * | | Add specs in triggers_spec.rb (Halfway)Shinya Maeda2017-04-071-0/+8
| | | |
| * | | Use allow_destroy. Remove condtion from form.haml.Shinya Maeda2017-04-074-24/+13
| | | |
| * | | Add form for scheduled triggerShinya Maeda2017-04-077-4/+59
| | | |
* | | | Merge branch 'fix-github-import-rake-task' into 'master' Sean McGivern2017-04-071-2/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix rake test to import Github repositories See merge request !10549
| * | | | Fix rake test to import Github repositoriesDouglas Barbosa Alexandre2017-04-071-2/+9
| | | | |
* | | | | Merge branch 'docs/ci-variables-remove-my-email' into 'master' Achilleas Pipinellis2017-04-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove wrong user email from CI variables example output See merge request !10554
| * | | | | Remove wrong user email from CI variables example outputAchilleas Pipinellis2017-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'optimise-builds' into 'master' Sean McGivern2017-04-074-1/+43
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimise Pipelines > Jobs index controller Closes #27389 See merge request !10546
| * | | | | Count number of queriesKamil Trzcinski2017-04-074-1/+43
| | | | | |
View Lorry Controller Status