summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Review changes30622-resolve-note-loading-icon-goneLuke "Jared" Bennett2017-04-121-0/+5
|
* Fix resolve spinner and add testLuke "Jared" Bennett2017-04-113-4/+4
|
* Merge branch 'rs-remove-open-for-scope' into 'master' test-branch-nameDouwe Maan2017-04-114-16/+0
|\ | | | | | | | | Remove unused scopes See merge request !10609
| * Remove an unused `cared` scope from Issue and MergeRequestrs-remove-open-for-scopeRobert Speicher2017-04-103-6/+0
| |
| * Remove an unused `Issue.open_for` scopeRobert Speicher2017-04-102-10/+0
| |
* | Merge branch 'zj-fk-ci-triggers' into 'master' Yorick Peterse2017-04-114-1/+22
|\ \ | | | | | | | | | | | | Add foreign key on trigger requests See merge request !10537
| * | Add foreign key on trigger requestszj-fk-ci-triggersZ.J. van de Weg2017-04-114-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | I started out as I missed the foreign key on ci_triggers and projects. However, it seemed Yorick caught this already on gitlab-org/gitlab-ce!9388. Still I found a missing foreign key, between the trigger requests and triggers. This commit adds it, and removes the depend: :destroy on the Rails model Ci::Triggers
* | | Merge branch 'dz-fix-project-view' into 'master' Annabel Dunstone Gray2017-04-116-4/+56
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change project view default for existing users and anonymous visitors to files+readme Closes #29926 See merge request !10498
| * | | Change project view default for existing users and anonymous visitors to ↵dz-fix-project-viewDmitriy Zaporozhets2017-04-106-4/+56
| | | | | | | | | | | | | | | | | | | | | | | | files+readme Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'signed-out-menu-shortcuts' into 'master' Jacob Schatz2017-04-112-16/+51
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Added keyboard shortcuts to signed out menu See merge request !10526
| * | | | Added keyboard shortcuts to signed out menusigned-out-menu-shortcutsPhil Hughes2017-04-102-16/+51
| | | | |
* | | | | Merge branch 'mr-widget-bug-fix' into 'master' Stan Hu2017-04-113-1/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the MR widget that merged any MR when choosing the option "Merge when pipeline succeeds" from the dropdown Closes #29568 See merge request !10611
| * | | | | Added CHANGELOGmr-widget-bug-fixJose Ivan Vargas2017-04-101-0/+5
| | | | | |
| * | | | | Added tests and fixed a typoJose Ivan Vargas2017-04-102-1/+14
| | | | | |
| * | | | | Fix typo on the class merge-when-pipeline_succeedsJose Ivan Vargas2017-04-101-1/+1
| | | | | |
* | | | | | Merge branch 'fix/gb/improve-container-registry-clipboard-links' into 'master' Kamil Trzciński2017-04-117-22/+88
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix container repository/tag location text copied into the clipboard Closes #30695 See merge request !10587
| * | | | | | Add container registry repositories view specsfix/gb/improve-container-registry-clipboard-linksGrzegorz Bizon2017-04-103-2/+38
| | | | | | |
| * | | | | | Add method that returns location of registry imageGrzegorz Bizon2017-04-102-0/+11
| | | | | | |
| * | | | | | Improve test examples for container repository classGrzegorz Bizon2017-04-101-21/+21
| | | | | | |
| * | | | | | Add method that returns a registry repository locationGrzegorz Bizon2017-04-102-0/+19
| | | | | | |
* | | | | | | Merge branch 'redundant-steps-for-ci' into 'master' Rémy Coutable2017-04-112-18/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant steps from .gitlab-ci-yml configs See merge request !10425
| * | | | | | | Remove unused code from the scripts/prepare_build.sh filebogdanvlviv2017-04-051-16/+7
| | | | | | | |
| * | | | | | | Remove redundant steps from .gitlab-ci-yml configsbogdanvlviv2017-04-031-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scripts/prepare_build.sh already does it
* | | | | | | | Merge branch 'patch-15' into 'master' Rémy Coutable2017-04-111-3/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed wrong links in README.md See merge request !10556
| * | | | | | | | Fixed wrong links in README.mdFabrizio Cucci2017-04-071-3/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'patch-15' into 'master' Rémy Coutable2017-04-111-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set NODE_ENV for yarn:install in patch_versions.md See merge request !10521
| * | | | | | | | | Set NODE_ENV=production for yarn:installJonathan la Cour2017-04-071-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'boards-done-add-tooltip' into 'master' Filipa Lacerda2017-04-112-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue 22424: Add tooltip to header of Done list Closes #22424 See merge request !10574
| * | | | | | | | | | Issue 22424: Add tooltip to header of Done listandrew brown2017-04-092-0/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'rs-skip-nested-groups-seed' into 'master' Rémy Coutable2017-04-112-33/+41
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the nested groups seed behind an environment flag See merge request !10601
| * | | | | | | | | | | Move the nested groups seed behind an environment flagrs-skip-nested-groups-seedRobert Speicher2017-04-102-33/+41
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seed downloads 2.1 GB worth of repositories. Google can afford the bandwidth, but if a person using the GDK is on a metered connection, that's not so great. Also the GDK test suite runs this seed, so every CI run for that project had to download those as well. Needlessly wasteful.
* | | | | | | | | | | Merge branch 'double-border' into 'master' Filipa Lacerda2017-04-111-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove double border on MR tab See merge request !10593
| * | | | | | | | | | Remove double border on MR tabdouble-borderAnnabel Dunstone Gray2017-04-101-1/+0
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '30678-improve-dev-server-process' into 'master' Jacob Schatz2017-04-115-22/+402
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make webpack-dev-server process more resilient when switching branches. Closes #30678 See merge request !10581
| * | | | | | | | | | | add CHANGELOG.md entry for !1058130678-improve-dev-server-processMike Greiling2017-04-101-0/+4
| | | | | | | | | | | |
| * | | | | | | | | | | add license approbals for nodemon dependenciesMike Greiling2017-04-101-0/+18
| | | | | | | | | | | |
| * | | | | | | | | | | use nodemon to watch for changes to webpack config and restart the dev ↵Mike Greiling2017-04-102-12/+312
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server when necessary
| * | | | | | | | | | | add license approval for ansi-htmlMike Greiling2017-04-101-0/+6
| | | | | | | | | | | |
| * | | | | | | | | | | watch node_modules for changes when a module is missingMike Greiling2017-04-103-11/+63
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix_cache_expiration_in_repository' into 'master' Robert Speicher2017-04-103-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix redundant cache expiration in Repository Closes #30146 See merge request !10575
| * | | | | | | | | | | Fix redundant cache expiration in Repositoryblackst0ne2017-04-103-4/+4
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'dm-remove-copy-link-on-svgs' into 'master' Robert Speicher2017-04-1010-45/+63
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show 'Copy content' button on text files that are not rendered as text See merge request !10563
| * | | | | | | | | | | Don't show 'Copy content' button on text files that are not rendered as textDouwe Maan2017-04-1010-45/+63
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'rs-fix-doc-anchor-link' into 'master' Achilleas Pipinellis2017-04-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Generate new recovery codes using SSH" documentation link See merge request !10512
| * | | | | | | | | | | Fix "Generate new recovery codes using SSH" documentation linkrs-fix-doc-anchor-linkRobert Speicher2017-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | Merge branch 'dewet-do-disclaimer' into 'master' Achilleas Pipinellis2017-04-102-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disclaimer for testing guide not be be used in prod See merge request !10468
| * | | | | | | | | | | | Disclaimer for testing guide not be be used in proddewet-do-disclaimerDe Wet Blomerus2017-04-052-3/+6
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '1595-ee-backport-environments-tests' into 'master' Clement Ho2017-04-102-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of EE changes in environments tests See merge request !10528
| * | | | | | | | | | | | Backport of EE changes in environments tests1595-ee-backport-environments-testsFilipa Lacerda2017-04-072-4/+6
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'backport-ee-1525' into 'master' Robert Speicher2017-04-1012-107/+286
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport Git-env code from EE "Fix push rules on Git 2.11" (gitlab-org/gitlab-ee!1525) See merge request !10547