summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updated gitlab-markup forked gem to download from rubygemsbug/rst-forked-gemGabriel Mazetto2016-10-133-9/+7
|
* Use forked github-markup gem to enable python3 support with omnibusGabriel Mazetto2016-10-132-3/+9
|
* Merge branch 'project-edit-branch-dropdown-fix' into 'master' Fatih Acet2016-10-131-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | Fixed default branch dropdown not converting to select2 ## What does this MR do? The LFS dropdown doesn't have the `data` attribute & it isn't needed because it doesn't hide/show any elements. This filters out the `<select>` without that attribute. ## What are the relevant issue numbers? Closes #23200 See merge request !6810
| * Fixed default branch dropdown not converting to select2project-edit-branch-dropdown-fixPhil Hughes2016-10-111-1/+3
| | | | | | | | Closes #23200
* | Merge branch 'grouped-builds-arrow' into 'master' Fatih Acet2016-10-132-7/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix overflow to show grouped builds arrow ## What does this MR do? Removes overflow style so that the arrow shows up again ## Screenshots (if relevant) Before: ![Screen_Shot_2016-10-11_at_9.11.55_AM](/uploads/92d2a0c34d2af050e58468c8d61f4cd3/Screen_Shot_2016-10-11_at_9.11.55_AM.png) After: ![Screen_Shot_2016-10-11_at_9.11.41_AM](/uploads/2c4c422a21fb6450d00ae638aef29d89/Screen_Shot_2016-10-11_at_9.11.41_AM.png) Scrolling: ![Screen_Shot_2016-10-11_at_9.40.36_AM](/uploads/e5b1e3125d881c5882cf199026110d48/Screen_Shot_2016-10-11_at_9.40.36_AM.png) See merge request !6808
| * | Allow scrolling within grouped pipelinesgrouped-builds-arrowAnnabel Dunstone Gray2016-10-112-6/+11
| | |
| * | Fix overflow to show grouped builds arrowAnnabel Dunstone Gray2016-10-111-1/+0
| | |
* | | Merge branch 'feature/improve-mrwbs-and-todos-for-pipelines' into 'master' Kamil Trzciński2016-10-1315-118/+170
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trigger Merge When Pipeline Succeeds on pipeline event ## What does this MR do? This MR is meant to improve merge when build succeeds triggers, which has an impact on performance. - [x] Move Merge When Build Succeeds trigger from commit status to pipeline event - [x] Drop support for triggering event for branches that include commit status submitted without branch (no longer relevant) - [x] Perform Merge When Pipeline Succeeds asynchronously to improve performance and avoid race conditions - [x] Add missing feature test that verifies if MWBS feature actually works and merges merge requests - [x] Update the documentation to reflect change in the behavior Moved to separate merge request: - [ ] Rename Merge When Build Succeeds to Merge When Pipeline Succeeds - [ ] Update documentation to reflect name change for this feature ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing See merge request !6675
| * \ \ Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelinesfeature/improve-mrwbs-and-todos-for-pipelinesGrzegorz Bizon2016-10-1243-914/+1994
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Update health_check gem to `~> 2.2.0` API: Version information Revert "Merge branch 'tests-use-tmpfs' into 'master'" Added documentation chapter for Git attributes Use activerecord_sane_schema_dumper Add a separate stage for bundle check Add a bundle check step to ensure dependencies are correct Create a new /templates API namespace Add disabled delete button to protected branches Make spec deterministic refactors tests because of gitlab-test repository changes Addresses Robert's feedback Speed up specs for GET /projects/:id/events API: New /users/:id/events endpoint writes tests to verify the issue is solved and fixes breaking issues. removes inconsistency regarding tagging immediately as merged once you create a branch using new branch button and adds changelog entry
| * | | | Do not return from proc-closure in pipeline transitionGrzegorz Bizon2016-10-121-1/+1
| | | | |
| * | | | Improve desc for pipeline integration spec in MWBSGrzegorz Bizon2016-10-121-17/+19
| | | | |
| * | | | Schedule async pipeline success worker after commitGrzegorz Bizon2016-10-121-1/+2
| | | | |
| * | | | Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelinesGrzegorz Bizon2016-10-12488-3677/+8015
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (221 commits) Add CHANGELOG entry for 8.12.6 Added 'Download' button to snippet view Merge branch 'api-fix-project-group-sharing' into 'security' Add 8.12.5, 8.11.9, and 8.10.12 CHANGELOG entries FIx JS bug with select2 because of missing `data-field` attribute in select box. Remove pointless `.vagrant_enabled` file allow multiple labels commands Move some CHANGELOG entries to the 8.13.0 part Move operations/ to new location Move health check docs under user/admin_area/monitoring Make guests unable to view MRs Add examples of fake tokens to be used in docs Remove duplicate CHANGELOG entry Allow browsing branches that end with '.atom' Refactor the SubGit/SVN documentation Document the new CI_DEBUG_TRACE variable Remove redundant images changed the scss for the top line connectors to be exactly centered Rearrange GitLab basics READMEs New images for GitLab basics "Create MR" docs ... Conflicts: app/models/commit_status.rb
| * | | | | Add Changelog entry for MWBS trigger improvementsGrzegorz Bizon2016-10-071-0/+1
| | | | | |
| * | | | | Update documentation according to changes in MWBSGrzegorz Bizon2016-10-071-10/+10
| | | | | |
| * | | | | Add test that checks actual merge for MWBS featureGrzegorz Bizon2016-10-071-2/+13
| | | | | |
| * | | | | Improve merge when builds succeeds specs readabilityGrzegorz Bizon2016-10-071-16/+28
| | | | | |
| * | | | | Process MWBS in successful pipeline asynchronouslyGrzegorz Bizon2016-10-073-1/+37
| | | | | |
| * | | | | Rename pipeline workers to match current conventionGrzegorz Bizon2016-10-065-6/+6
| | | | | |
| * | | | | Remove support for branch-less builds in MWBSGrzegorz Bizon2016-10-062-22/+11
| | | | | | | | | | | | | | | | | | | | | | | | See !6675#note_16580143
| * | | | | Fix tests and code for MWBS event move to pipelineGrzegorz Bizon2016-10-062-23/+31
| | | | | |
| * | | | | Move MWBS trigger from build to pipeline eventGrzegorz Bizon2016-10-065-28/+26
| | | | | |
* | | | | | Merge branch 'trim-new-user' into 'master' Fatih Acet2016-10-132-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that whitespace doesn't cause adding members to fail I recently had to debug an issue where adding users wasn't working. It turned out that I was hitting "space" to confirm a `select2` dialog, and the server would throw out the whole email address because it was invalid. It looked as though GitLab was entirely ignoring my add-member request. Here's a fun gif: ![out](/uploads/5c306addb764067bca54add3b7a53c6c/out.gif) Ideally, there should also be validation client-side, so that the server doesn't need to silently fail, and the user will know what's going wrong. I'll look into creating an issue for that. Additionally, GitLab already seems to trim email addresses, sometimes? If you add _two_ address, with spaces, then the `value` of the `user_ids` DOM element will have the first `n-1` addresses without spaces. Weird. **TL;DR: Now spaces are always trimmed from new-member email addresses.** See merge request !3443
| * | | | | | Ensure that whitespace doesn't case adding members to failMitchell Hentges2016-10-102-2/+4
| | | | | | |
* | | | | | | Merge branch '22635-clipboard-icon' into 'master' Fatih Acet2016-10-132-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Copy to clipboard" action button has a mismatching white background. ## What does this MR do? Adds a class to all the clipboard icons which removes the extra padding. It also fixes some odd overlay when over the clipboard icon in commits list. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? To fix the extra padding and background color that was visible when it should not be ## Screenshots (if relevant) ![commits_list](/uploads/f988e2e2e2aea41fe3f7fe41c8a857ef/commits_list.png) ![file](/uploads/ce97909fc4e602af47fea46b8fffb7ad/file.png) ## Does this MR meet the acceptance criteria? - [x] [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 - [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 it does - 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? Closes #22635 See merge request !6785
| * | | | | | | Adds btn-transparent class in correct place due to changes in master22635-clipboard-iconFilipa Lacerda2016-10-111-1/+1
| | | | | | | |
| * | | | | | | Adds entry to CHANGELOGFilipa Lacerda2016-10-111-0/+1
| | | | | | | |
| * | | | | | | Fixes padding in all clipboard icons that have .btn classFilipa Lacerda2016-10-111-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'fix-some-specs' into 'master' Rémy Coutable2016-10-132-4/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve appearance_spec and deploy_key_spec In appearance_spec.rb we can use build instead create record in db. In deploy_key_spec.rb we can remove unused code. See merge request !6819
| * | | | | | | | Use build instead create record in appearance_specSemyon Pupkov2016-10-121-1/+1
| | | | | | | | |
| * | | | | | | | Remove unused lets from deploy_key specSemyon Pupkov2016-10-121-3/+0
| | | | | | | | |
* | | | | | | | | Merge branch 'refactor-event-spec' into 'master' Rémy Coutable2016-10-131-49/+61
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Union examples in event spec for speed up ## What does this MR do? Increase tests speed for event model. ## Why was this MR needed? This change saves about 15-18 seconds. See merge request !6821
| * | | | | | | | | Union examples in event spec fo speed upSemyon Pupkov2016-10-131-49/+61
| |/ / / / / / / /
* | | | | | | | | Merge branch 'update-gitlab-shell' into 'master' Yorick Peterse2016-10-132-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update to gitlab-shell 3.6.6 ## What does this MR do? This updates gitlab-shell to version 3.6.6 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [ ] 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? See merge request !6830
| * | | | | | | | | Update to gitlab-shell 3.6.6Yorick Peterse2016-10-122-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'es6-es5-poltergeist' into 'master' Fatih Acet2016-10-121-0/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document Capybara errors from es6 in es5 file. ## What does this MR do? Documents an error that I've banged my head against twice now. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The greater good. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [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) - [ ] 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 it does - 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? See merge request !6836
| * | | | | | | | | | Document Capybara errors from es6 in es5 file.es6-es5-poltergeistBryce Johnson2016-10-121-0/+11
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'mrchrisw/fix-debug-token' into 'master' Stan Hu2016-10-121-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix step number and token param in URL example. Fix gitlab-rails command code formatting. See merge request !6791
| * | | | | | | | | | | Fix step number and token param in URL example. Fix gitlab-rails command ↵mrchrisw/fix-debug-tokenChris Wilson2016-10-111-2/+2
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code formatting.
* | | | | | | | | | | Merge branch 'dz-improve-mr-compar' into 'master' Douwe Maan2016-10-1211-32/+101
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve merge request versions compare logic ## What does this MR do? Changes the way how we compare between for merge request versions ## Are there points in the code the reviewer needs to double check? no ## Why was this MR needed? So when I squash+rebase my commit I can get more accurate diff on what changed between versions ## Screenshots (if relevant) in discussion (below) ## Does this MR meet the acceptance criteria? - [x] [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 - [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? https://gitlab.com/gitlab-org/gitlab-ce/issues/22368, https://gitlab.com/gitlab-org/gitlab-ce/issues/22721 See merge request !6589
| * | | | | | | | | | Improve mr compare message when base is differentdz-improve-mr-comparDmitriy Zaporozhets2016-10-123-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Fix CHANGELOGDmitriy Zaporozhets2016-10-121-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Inform user when comparing 2 version with different baseDmitriy Zaporozhets2016-10-122-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Refactor straight compare diff codeDmitriy Zaporozhets2016-10-124-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Better tests for MergeRequestDiff#compare_with methodDmitriy Zaporozhets2016-10-121-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Improve tests for merge request diff modelDmitriy Zaporozhets2016-10-122-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Add mr version improvement to changelogDmitriy Zaporozhets2016-10-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Add spec for compare serviceDmitriy Zaporozhets2016-10-121-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Use straight diff approach when compare merge request versionsDmitriy Zaporozhets2016-10-123-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Bump gitlab_git to 10.6.8Dmitriy Zaporozhets2016-10-122-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>