summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove turbolinks progress bar27490-remove-turbolinks-barAnnabel Dunstone Gray2017-02-022-2/+4
|
* Merge branch '20452-remove-require-from-request_profiler-initializer' into ↵27537-flash-of-human-un-friendly-utc-timestampRobert Speicher2017-02-023-4/+5
|\ | | | | | | | | | | | | | | | | | | 'master' Don't require lib/gitlab/request_profiler/middleware.rb in config/initializers/request_profiler.rb Closes #20452 See merge request !8927
| * Don't require lib/gitlab/request_profiler/middleware.rb in ↵20452-remove-require-from-request_profiler-initializerRémy Coutable2017-02-023-4/+5
| | | | | | | | | | | | config/initializers/request_profiler.rb Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch ↵27537-flash-of-human-un-friendly-utc-timestamp-for-merge-requests-and-issuesAnnabel Dunstone Gray2017-02-020-0/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | '26859-comment-button-doesn-t-align-vertically-with-line-number' into 'master' Resolve "Comment button doesn't align vertically with line number" Closes #26859 See merge request !8918
* \ \ Merge branch ↵Annabel Dunstone Gray2017-02-021-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | '26859-comment-button-doesn-t-align-vertically-with-line-number' into 'master' Resolve "Comment button doesn't align vertically with line number" Closes #26859 See merge request !8918
| * | Vertically center add-diff-note button.26859-comment-button-doesn-t-align-vertically-with-line-numberBryce Johnson2017-02-011-1/+1
| | |
* | | Merge branch 'fix-ruby-verification-command' into 'master' Achilleas Pipinellis2017-02-021-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix Ruby verification command See merge request !8938
| * | | Fix Ruby verification commandfix-ruby-verification-commandSean McGivern2017-02-021-1/+1
| | | |
* | | | Merge branch '27321-double-separator-line-in-edit-projects-settings' into ↵Annabel Dunstone Gray2017-02-022-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Double separator line in Edit projects settings" Closes #27321 See merge request !8917
| * | | | Only render hr when user can't archive project.Bryce Johnson2017-02-022-1/+5
| | | | |
* | | | | Merge branch 'simplify-ssh-doc' into 'master' Achilleas Pipinellis2017-02-021-4/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Simplify the SSH protocol introduction and link to a DO tutorial See merge request !8901
| * | | | Simplify the SSH protocol introduction and link to a DO tutorialsimplify-ssh-docRémy Coutable2017-01-311-4/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch '27516-fix-wrong-call-to-project_cache_worker-method' into ↵Robert Speicher2017-02-022-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix wrong call to ProjectCacheWorker.perform, and call ProjectCacheWorker.perform_async instead Closes #27516 See merge request !8910
| * | | | | Fix wrong call to ProjectCacheWorker.perform27516-fix-wrong-call-to-project_cache_worker-methodRémy Coutable2017-01-312-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's either ProjectCacheWorker#perform or ProjectCacheWorker.perform_async! Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'group-label-sidebar-link' into 'master' Sean McGivern2017-02-023-1/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed group label in issuable sidebar Closes #27253 See merge request !8924
| * | | | | | Fixed group label in issuable sidebargroup-label-sidebar-linkPhil Hughes2017-02-023-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group label link was pointing to group#issues rather than the projects issues. This fixes that by sending the correct subject to the link_to_label helper method. Closes #27253
* | | | | | | Merge branch '27291-unify-mr-diff-file-buttons' into 'master' Annabel Dunstone Gray2017-02-026-9/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unifies mr diff file button style Closes #27291 See merge request !8874
| * | | | | | | removes old css class from everywhere27291-unify-mr-diff-file-buttonsNur Rony2017-02-023-7/+3
| | | | | | | |
| * | | | | | | adds changelogNur Rony2017-01-301-0/+4
| | | | | | | |
| * | | | | | | unifies mr diff file button styleNur Rony2017-01-302-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'fix-filtered-search-manager-spec' into 'master' Filipa Lacerda2017-02-021-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix filtered search manager spec teaspoon error See merge request !8919
| * | | | | | | Fix filtered search manager spec teaspoon errorfix-filtered-search-manager-specClement Ho2017-02-011-0/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '20248-add-coverage-regex-in-job-yaml' into 'master'Douwe Maan2017-02-0218-38/+312
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to define a coverage regex in the .gitlab-ci.yml Closes #20428 See merge request !7447
| * | | | | | | Be more lenient on build coverage value updates and fix specsLeandro Camargo2017-01-252-1/+2
| | | | | | | |
| * | | | | | | Make some other refinements to validation logicLeandro Camargo2017-01-251-2/+2
| | | | | | | |
| * | | | | | | Make more code improvements around the '/' stripping logicLeandro Camargo2017-01-257-37/+35
| | | | | | | |
| * | | | | | | Improve/polish code logic for some Ci::Build methodsLeandro Camargo2017-01-251-4/+4
| | | | | | | |
| * | | | | | | Force coverage value to always be surrounded by '/'Leandro Camargo2017-01-258-41/+65
| | | | | | | |
| * | | | | | | Improve specs styles/organization and add some more specsLeandro Camargo2017-01-254-20/+38
| | | | | | | |
| * | | | | | | Comply to more requirements and requests made in the code reviewLeandro Camargo2017-01-256-17/+28
| | | | | | | |
| * | | | | | | Simplify coverage setting and comply to some requests in code reviewLeandro Camargo2017-01-256-62/+28
| | | | | | | |
| * | | | | | | Fix wrong description for Coverage entry (in ruby comments)Leandro Camargo2017-01-251-1/+1
| | | | | | | |
| * | | | | | | Add specs to cover the implemented feature and fix a small bugLeandro Camargo2017-01-256-6/+131
| | | | | | | |
| * | | | | | | Add changelog entry and extend the documentation accordinglyLeandro Camargo2017-01-252-0/+55
| | | | | | | |
| * | | | | | | Add `coverage` to the Global config entry as wellLeandro Camargo2017-01-251-1/+4
| | | | | | | |
| * | | | | | | Change expected `coverage` structure for CI configuration YAML fileLeandro Camargo2017-01-254-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using: `coverage: /\(\d+.\d+%\) covered/` This structure must be used now: ``` coverage: output_filter: /\(\d+.\d+%\) covered/` ``` The surrounding '/' is optional.
| * | | | | | | Comply to requests made in the review and adjust to the Entry/Node changesLeandro Camargo2017-01-255-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit: * Turns `coverage_regex` into `coverage` entry in yml file * Fixes smaller requests from code reviewers for the previous commit * This commit is temporary (will be squashed afterwards) This commit does not (further commits will do though): * Add global `coverage` entry handling in yml file as suggested by Grzegorz * Add specs * Create changelog * Create docs
| * | | | | | | Add ability to define a coverage regex in the .gitlab-ci.ymlLeandro Camargo2017-01-258-7/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Instead of using the proposed `coverage` key, this expects `coverage_regex`
* | | | | | | | Merge branch ↵Alfredo Sumaran2017-02-026-5/+56
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25811-pipeline-number-and-url-do-not-update-when-new-pipeline-is-triggered' into 'master' Update pipeline and commit URL and text on CI status change Closes #25811 See merge request !8351
| * | | | | | | | Update pipeline and commit URL and text on CI status change25811-pipeline-number-and-url-do-not-update-when-new-pipeline-is-triggeredSam Rose2017-02-016-5/+56
| | | | | | | | |
* | | | | | | | | Merge branch 'snippet-spam' into 'master' Rémy Coutable2017-02-020-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snippet spam Closes #26276 See merge request !8911
* \ \ \ \ \ \ \ \ \ Merge branch 'snippet-spam' into 'master' Rémy Coutable2017-02-0225-26/+286
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Snippet spam Closes #26276 See merge request !8911
| * | | | | | | | Use `add_$role` helper in snippets specssnippet-spamSean McGivern2017-02-022-6/+6
| | | | | | | | |
| * | | | | | | | Check public snippets for spamSean McGivern2017-02-0219-12/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the same spam checks to public snippets (either personal snippets that are public, or public snippets on public projects) as to issues on public projects.
| * | | | | | | | Keep snippet visibility on errorSean McGivern2017-02-027-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a snippet is submitted, but there's an error, we didn't keep the visibility level. As the default is private, this means that submitting a public snippet that failed would then fall back to being a private snippet.
* | | | | | | | | Merge branch 'fix-depr-warn' into 'master' Rémy Coutable2017-02-024-4/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolve deprecation warnings Closes #27423 See merge request !8855
| * | | | | | | | | add complete changelogAdam Pahlevi2017-01-311-0/+4
| | | | | | | | | |
| * | | | | | | | | resolve deprecation warningsAdam Pahlevi2017-01-313-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don’t pass AR object, use the ID to avoid depr warning pass in the id instead of AR object to specs for `ProjectDestroyWorker`
* | | | | | | | | | Merge branch 'rs-why-five-times-surely-twice-is-enough' into 'master' Rémy Coutable2017-02-027-102/+72
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the number of loops that Cycle Analytics specs use See merge request !8871
| * | | | | | | | | Reduce the number of loops that Cycle Analytics specs users-why-five-times-surely-twice-is-enoughRobert Speicher2017-02-017-102/+72
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/27402
View Lorry Controller Status