summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove hidden-xs classes from last columns in environments and pipelines table.28661-ci-tables-buttonsFilipa Lacerda2017-02-287-113/+97
| | | | | Transform pipelines table css to match structure of pipelines table Make environments table overflow
* Merge branch 'only-create-unmergeable-todo-once' into 'master' Kamil Trzciński2017-02-285-11/+34
|\ | | | | | | | | | | | | Only create unmergeable todos once Closes #28555 See merge request !9513
| * Only create unmergeable todos onceonly-create-unmergeable-todo-onceSean McGivern2017-02-245-11/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we created an unmergeable todo when a merge request: 1. Had merge when pipeline succeeds set. 2. Became unmergeable. However, when merge when pipeline succeeds fails due to unmergeability, the flag isn't actually removed. And a merge request can become unmergeable multiple times, as every time the target branch is updated we need to re-check the mergeable status. This means that if the todo was marked done, and the MR was checked again, a new todo would be created for the same event. Instead of checking this, we should create the todo from the service responsible for merging when the pipeline succeeds. That way the todo is guaranteed to only be created when we care about it.
* | Merge branch 'fix-migration-downtime' into 'master' Rubén Dávila Santos2017-02-281-0/+2
|\ \ | | | | | | | | | | | | Fix migration without DOWNTIME clause specified See merge request !9571
| * | Fix migration without DOWNTIME clause specifiedRuben Davila2017-02-281-0/+2
|/ /
* | Merge branch 'fix-rubocop' into 'master' cherry-picking-regressions-8.17.0Robert Speicher2017-02-271-1/+1
|\ \ | | | | | | | | | | | | Make RuboCop happy See merge request !9554
| * | Make RuboCop happyfix-rubocopSean McGivern2017-02-271-1/+1
| | |
* | | Merge branch '25920-create-issue-from-failing-build' into 'master' Clement Ho2017-02-274-3/+59
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add button to create issue for failing build Closes #25920 See merge request !9391
| * | | Fix CSS classesAlex Sanford2017-02-274-3/+59
|/ / /
* | | Merge branch '20890-comment-image-inline' into 'master' 28711-cherry-picking-ui-regressions-8-17-0Robert Speicher2017-02-273-14/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix inline comment images by removing wrapper #20890 Closes #20890 See merge request !5804
| * | | Fix false positive caused by non-interpolated string useJared Deckard2016-08-131-2/+2
| | | |
| * | | Fix inline comment images by removing wrapper #20890Jared Deckard2016-08-133-12/+5
| | | |
* | | | Merge branch 'fix-webpack-dev-server-proxy' into 'master' Douwe Maan2017-02-271-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix broken dev environment in master See merge request !9557
| * | | | fix missing @ symbolMike Greiling2017-02-271-1/+1
| | | | |
* | | | | Merge branch '28723-consistent-handling-indexof' into 'master' Clement Ho2017-02-277-9/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep consistent in handling indexOf results Closes #28723 See merge request !9531
| * | | | | Keep consistent in handling indexOf resultsTakuya Noguchi2017-02-257-9/+13
| | | | | |
* | | | | | Merge branch 'dz-nested-groups-fixtures' into 'master' Douwe Maan2017-02-271-0/+69
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add development fixtures for nested groups See merge request !9553
| * | | | | | Add development fixtures for nested groupsdz-nested-groups-fixturesDmitriy Zaporozhets2017-02-271-0/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch '28212-avoid-dos-on-build-trace' into 'master' Clement Ho2017-02-272-13/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace setInterval with setTimeout to prevent highly frequent requests Closes #28212 See merge request !9271
| * | | | | | | Replace setInterval with setTimeout to prevent highly frequent requestsTakuya Noguchi2017-02-252-13/+24
| | |/ / / / / | |/| | | | |
* | | | | | | Update CHANGELOG.md for 8.16.7James Lopez2017-02-271-0/+1
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch '27840-improve-search-bar-experience' into 'master' Annabel Dunstone Gray2017-02-274-3/+55
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #27840 - Improve the search bar experience on mobile Closes #27840 See merge request !9280
| * | | | | | | Fix #27840 - Improve the search bar experience on mobilePratik Borsadiya2017-02-244-3/+55
| | | | | | | |
* | | | | | | | Update CHANGELOG.md for 8.16.7James Lopez2017-02-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJames Lopez2017-02-273-31/+64
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'remove-jquery-ui-draggable' into 'master' Jacob Schatz2017-02-272-25/+58
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed jQuery UI draggable See merge request !8582
| | * | | | | | | | Removed jQuery UI draggableremove-jquery-ui-draggablePhil Hughes2017-02-272-25/+58
| | | | | | | | | |
| * | | | | | | | | Merge branch 'fix-webpack-dev-server-proxy' into 'master' Douwe Maan2017-02-271-6/+6
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix webpack dev server when behind proxy See merge request !9543
| | * | | | | | | | ensure webpack dev server proxy connects regardless of request headersfix-webpack-dev-server-proxyMike Greiling2017-02-271-6/+6
| | | | | | | | | |
* | | | | | | | | | Update CHANGELOG.md for 8.16.7James Lopez2017-02-272-4/+4
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch 'rs-uploaders' into 'master' Douwe Maan2017-02-2715-94/+191
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor refactoring of Uploaders See merge request !9490
| * | | | | | | | | Add feature specs for three types of user uploadsrs-uploadersRobert Speicher2017-02-245-29/+112
| | | | | | | | | |
| * | | | | | | | | Minor refactoring of UploadersRobert Speicher2017-02-2410-65/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Moves a duplicate `file_storage?` definition into the common `GitlabUploader` ancestor. - Get the `uploads` base directory from a class method rather than hard-coding it where it's needed. This will be used in a subsequent MR to store Uploads in the database. - Improves the specs for uploaders.
* | | | | | | | | | Merge branch '28753-align-buttons-environments' into 'master' Annabel Dunstone Gray2017-02-272-26/+28
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align last column buttons with new environment button Closes #28753 See merge request !9551
| * | | | | | | | | | Align last column buttons with new environment button28753-align-buttons-environmentsFilipa Lacerda2017-02-272-26/+28
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'ssh-key-paste' into 'master' Filipa Lacerda2017-02-273-4/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates SSH key title after pasting key Closes #28436 See merge request !9481
| * | | | | | | | | | | Updates SSH key title after pasting keyPhil Hughes2017-02-273-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was listening for focusout, it now listens for blur & paste events Closes #28436
* | | | | | | | | | | | Merge branch 'mock-ci-service' into 'master'Douwe Maan2017-02-278-3/+155
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Mock CI service/integration See merge request !9250
| * | | | | | | | | | | | Add MockCiService integrationmock-ci-serviceEric Eastwood2017-02-248-3/+155
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9250/ See https://gitlab.com/madlittlemods/gl-mock-ci-service
* | | | | | | | | | | | Merge branch 'rss-btn-alignment-fix' into 'master' Annabel Dunstone Gray2017-02-276-12/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed alignment of RSS button on activity pages Closes #28572 See merge request !9478
| * | | | | | | | | | | | Fixed alignment of RSS button on activity pagesrss-btn-alignment-fixPhil Hughes2017-02-236-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a tooltip to the buttons that did not have any Closes #28572
* | | | | | | | | | | | | Merge branch 'mr-diff-comment-button' into 'master' Annabel Dunstone Gray2017-02-279-68/+129
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved the diff comment button UX Closes #27543 See merge request !9448
| * | | | | | | | | | | | | Removed link transitionmr-diff-comment-buttonPhil Hughes2017-02-276-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed hll overriding is-over class
| * | | | | | | | | | | | | Changed dark hover backgroundPhil Hughes2017-02-271-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Moved color values into variablesPhil Hughes2017-02-275-15/+20
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Grow the button on hoverPhil Hughes2017-02-272-15/+15
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Improved the diff comment button UXPhil Hughes2017-02-279-59/+106
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It now shows the line will be commenting on my highlight the line number cells with a lighter color. The button has also been made smaller, it was previously way over the top & took over a lot more space than it should of done Closes #27543
* | | | | | | | | | | | | Merge branch 'ci-tables-ui-improvements' into 'master' Annabel Dunstone Gray2017-02-274-267/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipelines tables UI improvements Closes #28383, #26611, #21788, #27048, and #27828 See merge request !9442
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ci-tables-ui-improvementsci-tables-ui-improvementsFilipa Lacerda2017-02-27599-3773/+6228
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (196 commits) Add quotes to coverage pattern Update CHANGELOG.md Bump omniauth to 1.4.2 Bump Hashie to 3.5.5 to eliminate warning noise use single backticks for inline code Add performance query regression fix for !9088 affecting #27267 Fix spec API: Return 400 for all validation erros in the mebers API Adds confirmation for cancel button Add newline Corrected indentation on the template string Adds backoff algo from EE to CE We don't need these checks anymore Raise error when no content is provided Address review Update API v3 in line with v4 Fix new offenses Fix spec Fix specs Rename commit_file, commit_dir and remove_file and update specs ...
| * | | | | | | | | | | | | Guarantees we show at least 4 stages in line in smaller screensFilipa Lacerda2017-02-231-0/+1
| | | | | | | | | | | | | |