summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add some missing tests for detailed status methodsbuild-statusesGrzegorz Bizon2016-12-143-2/+32
|
* Remove trailing blank line from Allowable moduleGrzegorz Bizon2016-12-141-1/+0
|
* Update manual build icon SVGGrzegorz Bizon2016-12-131-1/+1
|
* Make it possible to mix `Gitlab::Routing` inGrzegorz Bizon2016-12-133-1/+30
|
* Extract abilities checking module from ability modelGrzegorz Bizon2016-12-134-7/+36
|
* Extend tests for pipeline detailed status helpersGrzegorz Bizon2016-12-131-12/+18
|
* Add tests for common build detailed status helpersGrzegorz Bizon2016-12-131-0/+37
|
* Add missing tests for build `cancelable?` methodGrzegorz Bizon2016-12-131-0/+36
|
* Add tests for detailed build statuses factoryGrzegorz Bizon2016-12-131-0/+141
|
* Make it possible to retry build that was canceledGrzegorz Bizon2016-12-132-1/+9
|
* Make build retryable only if complete and executedGrzegorz Bizon2016-12-132-9/+32
|
* Improve readability in methods for detailed statusGrzegorz Bizon2016-12-134-4/+12
|
* Add tests for build cancelable/retryable statusesGrzegorz Bizon2016-12-132-0/+172
|
* Extend specs for build play/stop detailed statusesGrzegorz Bizon2016-12-132-7/+55
|
* Refine build stop/play extended status specsGrzegorz Bizon2016-12-133-35/+35
|
* Use manual build icon in play/stop build statusesGrzegorz Bizon2016-12-133-6/+12
|
* Adds manual action icon and case to show itFilipa Lacerda2016-12-132-0/+3
|
* Fix detailed status specs for pipeline stage modelGrzegorz Bizon2016-12-121-1/+3
|
* Fix detailed status badge for generic commit statusGrzegorz Bizon2016-12-121-1/+1
| | | | [ci skip]
* Fix pipeline specs for detailed statusesGrzegorz Bizon2016-12-121-8/+12
| | | | [ci skip]
* Add specs for build stop extended detailed statusGrzegorz Bizon2016-12-122-4/+59
|
* Add tests for build play extended detailed statusGrzegorz Bizon2016-12-122-3/+69
|
* Fix build stop extended status CSS classGrzegorz Bizon2016-12-121-4/+0
|
* Fix path to build status details in common helpersGrzegorz Bizon2016-12-121-1/+1
|
* Improve detailed status badge partialGrzegorz Bizon2016-12-128-18/+14
|
* Revert some unneeded changesKamil Trzcinski2016-12-121-1/+1
|
* Add action_class/action_titleKamil Trzcinski2016-12-125-3/+30
|
* Rename icon_with_label to icon_with_descriptionKamil Trzcinski2016-12-128-8/+9
|
* Fix auto loading of constants for Ci StatusesKamil Trzcinski2016-12-129-20/+21
|
* Fix some detailed statuses specs related to abilitiesGrzegorz Bizon2016-12-1210-18/+49
|
* Fix tests related to detailed statuses and permissionsGrzegorz Bizon2016-12-1214-41/+45
| | | | [ci skip]
* Incorporate permission checks into new CI statusesGrzegorz Bizon2016-12-1211-49/+60
| | | | [ci skip]
* Refactor ci status factories to DRY code a littleGrzegorz Bizon2016-12-125-29/+28
|
* Remove ci_status_with_icon helper and replace it with partial [ci skip]Kamil Trzcinski2016-12-128-34/+17
|
* Check permission of detailsKamil Trzcinski2016-12-124-7/+7
|
* Introduce `cancelable` and `returnable` [ci skip]Kamil Trzcinski2016-12-125-35/+64
|
* Improve actionsKamil Trzcinski2016-12-125-18/+110
|
* Added Ci::Status::BuildKamil Trzcinski2016-12-125-3/+84
|
* Merge branch '25510-fix-notifications-dropdown-alignment' into 'master' Fatih Acet2016-12-125-5/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment for notification settings ajax response ## What does this MR do? Fixes a issue where an AJAX call to change your global notification settings will return an html partial which has the incorrect dropdown alignment class, in some cases causing the dropdown menu to become obscured on the left side of the screen. ## Are there points in the code the reviewer needs to double check? ## Screenshots (if relevant) See issue #25510 for a screenshot of the problem and steps to reproduce. ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [ ] ~~API support added~~ - Tests - [ ] ~~Added for this feature/bug~~ - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25510 See merge request !8024
| * remove left_align setting from notification setting dropdown in favor of a ↵25510-fix-notifications-dropdown-alignmentMike Greiling2016-12-106-10/+12
| | | | | | | | pure css solution
| * fix alignment for notification settings ajax responseMike Greiling2016-12-091-1/+5
| |
* | Merge branch 'features/api-snippets' into 'master' Sean McGivern2016-12-1211-26/+594
|\ \ | | | | | | | | | | | | | | | | | | Adding support for personal snippet endpoint on the API Closes #22042 See merge request !6373
| * | API: Endpoint to expose personal snippets as /snippetsGuyzmo2016-12-0111-26/+594
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the necessary API for the new /snippets Restful resource added with this commit. Added a new Grape class `Snippets`, as well as a `PersonalSnippet` entity. Issue: #20042 Merge-Request: !6373 Signed-off-by: Guyzmo <guyzmo+gitlab+pub@m0g.net>
* | | Merge branch 'patch-8' into 'master' Sean McGivern2016-12-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix typo See merge request !8029
| * | | Fix typoIsmail S2016-12-111-1/+1
| | | |
* | | | Merge branch 'patch-8' into 'master' Robert Schilling2016-12-111-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in curl example request See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html ## What does this MR do? Fix a typo in a curl example Closes #23834 ## Moving docs to a new location? See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location - [ x] Make sure the old link is not removed and has its contents replaced with a link to the new location. - [ x] Make sure internal links pointing to the document in question are not broken. - [ x] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory. - [ x] If working on CE, submit an MR to EE with the changes as well. See merge request !8030
| * | | Fix typo in curl example requestGeorg Hartmann2016-12-111-1/+1
|/ / /
* | | Merge branch 'docs/change-docs-title' into 'master' Achilleas Pipinellis2016-12-111-1/+1
|\ \ \ | |_|/ |/| | | | | | | | Change docs title to represent the edition See merge request !8026
| * | Change docs title to represent the editionAchilleas Pipinellis2016-12-111-1/+1
|/ /
* | Merge branch '25324-change-housekeeping-btn-to-default' into 'master' Alfredo Sumaran2016-12-092-1/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use default btn styling for Housekeeping button on projects settings page Changes the Housekeeping button styling on the project settings page from ```btn-save``` to ```btn-default``` **BEFORE:** ![Screen_Shot_2016-12-06_at_12_51_42_PM](/uploads/1b1c8a26eead025062e2c98d9d0f4286/Screen_Shot_2016-12-06_at_12_51_42_PM.png) **AFTER:** ![Screen_Shot_2016-12-06_at_12_51_57_PM](/uploads/9e7937af4a058fa1aa8b45653dbad3ee/Screen_Shot_2016-12-06_at_12_51_57_PM.png) Closes #25324 cc: @awhildy See merge request !7959