summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin2016-08-26145-750/+1721
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (107 commits) Fix external issue tracker "Issues" link leading to 404s Fix CHANGELOG entries related to 8.11 release. Fix changelog Reduce contributions calendar data payload Add lock_version to merge_requests table Add hover color to emoji icon Fix wrong Koding link Capitalize mentioned issue timeline notes Fix groups sort dropdown alignment Use icon helper Fix inline emoji text alignment Adds response mime type to transaction metric action when it's not HTML Moved two 8.11 changelog entries to 8.12 Fix markdown link in doc_styleguide.md Display project icon from default branch Reduce number of database queries on builds tab Update CHANGELOG Update Issue board documentation Label list shows all issues (opened or closed) with that label Update CHANGELOG ...
| * | | | | Remove old stuffsLin Jen-Shin2016-08-243-101/+2
| | | | | |
| * | | | | No longer neededLin Jen-Shin2016-08-241-4/+2
| | | | | |
| * | | | | Fix spacingLin Jen-Shin2016-08-241-1/+2
| | | | | |
| * | | | | Fix captionLin Jen-Shin2016-08-241-1/+1
| | | | | |
| * | | | | Fix CHANGELOGLin Jen-Shin2016-08-241-2/+1
| | | | | |
| * | | | | Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin2016-08-241281-10057/+47575
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (1174 commits) Added CHANGELOG Added unfold test to parallel and added 'diff discussion' context Fix Spinach branches spec Better first match on this MR also Change merge_error column from string to text type Fix typo in gitlab_flow.md entities: make Environment inherit EnvironmentBasic Updated to optimized specs from !5864 Added 'with an unfolded line should not allow commenting' scenario (line 125) Added addtional 'renderable' validator to check 'data-note-type' attr exists Allow passing an index to selectRowAtIndex Fixed enter key in search input not working Fix file links on project page Files view Fix incorrect "stopped impersonation" log message 8.11 is released, long live 8.12 Also check if Akismet is enabled, before showing the `Submit as spam` button. fix location of markdown help location Fix for update 8.10-to-8.11.md doc. Appease the linter. Add Ruby 2.3 upgrade notes. ...
| * | | | | | Update CHANGELOG due to the introduction of !5620Lin Jen-Shin2016-08-021-1/+1
| | | | | | |
| * | | | | | Merge branch 'master' into pipeline-hooksLin Jen-Shin2016-08-02182-1173/+3755
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (145 commits) Add support for relative links starting with ./ or / to RelativeLinkFilter (!5586) Add failing tests for #19028 Update installation guide for 8.11 Update CHANGELOG for 8.10.3 Catch what warden might throw when profiling requests to re-throw it webhooks: include old revision in MR update events Fix search results for notes without commits API methods should be documented using Grape's DSL Update CHANGELOG Fix RequestProfiler::Middleware error when code is reloaded in development Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration Fix specs Trim extra displayed carriage returns in diffs and files with CRLFs Avoid line_code and position calculation on line partial for plain view State specific default sort order for issuables refactored wait_for_archived_file method squashed - fixed label and milestone association problems, updated specs and refactored reader class a bit fix return value and spec squashed - fix timing issues in prod importing projects Minor fixes in the Env API endpoints ...
| * | | | | | | Add a CHANGELOG entry for pipeline eventsLin Jen-Shin2016-08-011-0/+1
| | | | | | | |
| * | | | | | | Add test for running hooks for pipeline after touchedLin Jen-Shin2016-08-011-2/+31
| | | | | | | |
| * | | | | | | Add API tests for pipeline_eventsLin Jen-Shin2016-08-011-2/+5
| | | | | | | |
| * | | | | | | Expose pipeline_events in the APILin Jen-Shin2016-08-012-2/+6
| | | | | | | |
| * | | | | | | Add test for PipelineDataBuilderLin Jen-Shin2016-08-012-1/+33
| | | | | | | |
| * | | | | | | Fix the test due to the format changedLin Jen-Shin2016-08-011-7/+9
| | | | | | | |
| * | | | | | | Slack pipeline events test and fix some issues along the wayLin Jen-Shin2016-08-013-16/+80
| | | | | | | |
| * | | | | | | Fix test for checking everything for Slack serviceLin Jen-Shin2016-07-301-0/+1
| | | | | | | |
| * | | | | | | Reduce complexity by extracting it to a methodLin Jen-Shin2016-07-301-17/+20
| | | | | | | |
| * | | | | | | Add pipeline_events to Slack service:Lin Jen-Shin2016-07-306-11/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add Service#event_names so that we don't have to hard code all event names in ServiceParams. Note that I don't know why we want to call plural on issue_event and merge_request_event so that we still need to hard code them for issues_event and merge_requests_event. See app/helpers/services_helper.rb for those special rules.
| * | | | | | | Fix that tricky side-effect issue in the testLin Jen-Shin2016-07-292-3/+5
| | | | | | | |
| * | | | | | | It was never usedLin Jen-Shin2016-07-291-2/+2
| | | | | | | |
| * | | | | | | Don't execute hooks if ci was supposed to be skippedLin Jen-Shin2016-07-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And we should preserve the return value
| * | | | | | | They could be nilLin Jen-Shin2016-07-291-4/+4
| | | | | | | |
| * | | | | | | Also touch the pipeline so we could just hook into update_stateLin Jen-Shin2016-07-292-6/+8
| | | | | | | |
| * | | | | | | We're not using original hash anyway, we could use itLin Jen-Shin2016-07-291-1/+1
| | | | | | | |
| * | | | | | | Add views for pipeline eventsLin Jen-Shin2016-07-292-1/+8
| | | | | | | |
| * | | | | | | WIP, initial work to implement pipeline hooks:Lin Jen-Shin2016-07-298-0/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I might be squashing this commit in the future.
* | | | | | | | Merge branch 'dz-bulk-edit-mr' into 'master' Rémy Coutable2016-09-0821-84/+237
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add bulk update support for merge requests list ## What does this MR do? Adds new feature: ability to update multiple merge requests at once from index page (same like we have for issues already) ## Are there points in the code the reviewer needs to double check? I don't think so ## Why was this MR needed? * consistency with issues * save user time when you want set same label/milestone to 20 merge requests ## Screenshots (if relevant) ![Screenshot_2016-09-08_11.48.49](/uploads/fe50b2472330e211eb8d6d6dafb15667/Screenshot_2016-09-08_11.48.49.png)![Screenshot_2016-09-08_11.48.46](/uploads/4833c3705120ec028f7a62a4e128998d/Screenshot_2016-09-08_11.48.46.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [x] ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] 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 you do - 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? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20087 See merge request !6226
| * | | | | | | | Refactor code for bulk update merge requests featuredz-bulk-edit-mrDmitriy Zaporozhets2016-09-085-29/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Refactor merge requests bulk update specDmitriy Zaporozhets2016-09-081-52/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Fix issues bulk update from issues index pageDmitriy Zaporozhets2016-09-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Add changelog item for merge requests bulk updateDmitriy Zaporozhets2016-09-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Fix issuable_bulk_update_path and merge request spinach testDmitriy Zaporozhets2016-09-082-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Make merge requests bulk update workingDmitriy Zaporozhets2016-09-084-1/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Add bulk update support for merge requests listDmitriy Zaporozhets2016-09-0816-81/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-09-083-1/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * \ \ \ \ \ \ \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-09-083-1/+5
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge branch 'fix/gitlab-export-confidential' into 'master' Rémy Coutable2016-09-053-1/+5
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix confidential issues made public after import Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21803 The gitlab.com import was ignoring the confidential attribute, hence making all issues public after being imported. The API has changed in order to also expose this field. See merge request !1992
| | | * | | | | | | | Fixed gitlab.com importer missing confidential attributeJames Lopez2016-09-053-1/+5
| | |/ / / / / / / /
* | | | | | | | | | Merge branch 'awards-control-margin' into 'master' Annabel Dunstone Gray2016-09-084-7/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix margin for awards-control buttons ## What does this MR do? Fixes margin in awards-control ## Screenshots (if relevant) Before: ![Screen_Shot_2016-09-06_at_10.58.03_AM](/uploads/b3fcd4103669bc7ae54a22093f492391/Screen_Shot_2016-09-06_at_10.58.03_AM.png) After: ![Screen_Shot_2016-09-06_at_10.54.54_AM](/uploads/dcd0e57a8cff82fe70990a9a8e2b1232/Screen_Shot_2016-09-06_at_10.54.54_AM.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/21896 See merge request !6233
| * | | | | | | | | | fix padding top/bottomawards-control-margintauriedavis2016-09-071-1/+1
| | | | | | | | | | |
| * | | | | | | | | | minor refactortauriedavis2016-09-071-5/+2
| | | | | | | | | | |
| * | | | | | | | | | fix margin for multi-line emojistauriedavis2016-09-073-1/+7
| | | | | | | | | | |
| * | | | | | | | | | fix margin for awards-control buttonstauriedavis2016-09-062-3/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'dz-mr-version-compare' into 'master' Douwe Maan2016-09-0810-32/+147
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow compare merge request versions ## What does this MR do? Add new functionality to the merge request page. It allows you easily compare merge request versions in one click. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To improve code review experience. ## Screenshots (if relevant) See discussion ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [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 you do - 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? https://gitlab.com/gitlab-org/gitlab-ce/issues/13570 See merge request !6127
| * | | | | | | | | | | Refactor compared_diff_version method in merge requests controllerdz-mr-version-compareDmitriy Zaporozhets2016-09-071-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | Refactor merge request version compare featureDmitriy Zaporozhets2016-09-073-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | Improve merge request version featureDmitriy Zaporozhets2016-09-076-41/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use version numbers instead of sha as more user-friendly * Make it clear that we compare later version (left) with older one (right) * Improve wording of version switch panel Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | Expand abbreviations in merge request version path helperDmitriy Zaporozhets2016-09-072-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | Add changelog entry and documentation for merge request versions compareDmitriy Zaporozhets2016-09-072-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status