summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Export date utility functions as ES6 modulesFilipa Lacerda2017-12-0724-237/+256
|
* Merge branch 'commit-title-wrapping' into 'master'Annabel Dunstone Gray2017-12-062-0/+6
|\ | | | | | | | | | | | | Fixes long commit links breaking the commit list layout Closes #36524 See merge request gitlab-org/gitlab-ce!15763
| * Fixes long commit links breaking the commit list layoutcommit-title-wrappingPhil Hughes2017-12-062-0/+6
| | | | | | | | Closes #36524
* | Merge branch 'admin-welcome-new-group-link' into 'master'Filipa Lacerda2017-12-063-1/+21
|\ \ | | | | | | | | | | | | | | | | | | Fixes admin welcome states new group path Closes #40645 See merge request gitlab-org/gitlab-ce!15761
| * | Fixes admin welcome states new group pathadmin-welcome-new-group-linkPhil Hughes2017-12-063-1/+21
| |/ | | | | | | Closes #40645
* | Merge branch 'throttle-touching-of-objects' into 'master'Sean McGivern2017-12-0610-3/+82
|\ \ | | | | | | | | | | | | | | | | | | Throttle the number of UPDATEs triggered by touch Closes #34763 See merge request gitlab-org/gitlab-ce!15682
| * | Throttle the number of UPDATEs triggered by touchYorick Peterse2017-12-0610-3/+82
| | | | | | | | | | | | | | | | | | | | | This throttles the number of UPDATE queries that can be triggered by calling "touch" on a Note, Issue, or MergeRequest. For Note objects we also take care of updating the associated "noteable" relation in a smarter way than Rails does by default.
* | | Merge branch 'patch-24' into 'master'Sean McGivern2017-12-062-1/+6
|\ \ \ | |/ / |/| | | | | | | | Fix graph notes number duplication. See merge request gitlab-org/gitlab-ce!15696
| * | Fix graph notes number duplication.Vladislav Kaverin2017-12-032-1/+6
| | | | | | | | | | | | Function `pluralize` already returns the number along with pluralized word.
* | | Merge branch ↵Sean McGivern2017-12-065-2/+40
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | '39364-in-issue-board-url-doesn-t-take-in-account-hostname-settings' into 'master' Resolve "In Issue board url doesn't take in account hostname settings" Closes #39364 See merge request gitlab-org/gitlab-ce!15703
| * | Add changelog entry39364-in-issue-board-url-doesn-t-take-in-account-hostname-settingsLuke Bennett2017-12-051-0/+5
| | |
| * | add boards_helper_specLuke Bennett2017-12-032-0/+27
| | |
| * | Add spec for boards_endpoint instance variableLuke Bennett2017-12-031-0/+6
| | |
| * | Use path helper instead of url helperLuke Bennett2017-12-032-2/+2
| |/
* | Merge branch 'ee-backport-issue_40654' into 'master'Sean McGivern2017-12-062-4/+12
|\ \ | | | | | | | | | | | | [CE-Backport] Fix board filter when milestone is predefined See merge request gitlab-org/gitlab-ce!15750
| * | [CE-Backport] Fix board filter when milestone is predefinedee-backport-issue_40654Felipe Artur2017-12-052-4/+12
| | |
* | | Merge branch 'downgrade-grpc-to-1.4.5' into 'master'Sean McGivern2017-12-061-5/+2
|\ \ \ | | | | | | | | | | | | | | | | Downgrade the grpc gem to 1.4.5 See merge request gitlab-org/gitlab-ce!15746
| * | | Downgrade the grpc gem to 1.4.5downgrade-grpc-to-1.4.5Jacob Vosmaer2017-12-051-5/+2
| | | |
* | | | Merge branch 'backport-board-scope-highlight' into 'master'Sean McGivern2017-12-061-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Backport board scope highlight See merge request gitlab-org/gitlab-ce!15757
| * | | | backport board scope highlightbackport-board-scope-highlightClement Ho2017-12-051-0/+10
| | | | |
* | | | | Merge branch '38869-templates' into 'master'Phil Hughes2017-12-069-296/+278
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Export template selector as ES6 modules See merge request gitlab-org/gitlab-ce!15524
| * | | | | Export template selector as ES6 modulesFilipa Lacerda2017-12-069-296/+278
|/ / / / /
* | | | | Merge branch '40543-generalize-detail-page-headers' into 'master'Phil Hughes2017-12-069-79/+66
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generalize detail page headers (Issues, Merge Requests, Snippets) Closes #40543 See merge request gitlab-org/gitlab-ce!15639
| * | | | | Generalize detail page headers40543-generalize-detail-page-headersEric Eastwood2017-12-059-79/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40543 Bug introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15192
* | | | | | Merge branch 'list-multiple-clusters' into 'master'Grzegorz Bizon2017-12-0644-231/+1485
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | List multiple clusters See merge request gitlab-org/gitlab-ce!15403
| * | | | | | Remove redundant empty line in CreateService specMatija Čupić2017-12-061-1/+0
| | | | | | |
| * | | | | | Fix gcp|user_controller_specsKamil Trzcinski2017-12-062-4/+6
| | | | | | |
| * | | | | | Refactor Clusters::CreateService specMatija Čupić2017-12-061-58/+62
| | | | | | |
| * | | | | | Remove Add Cluster button from clusters/indexMatija Čupić2017-12-052-6/+0
| | | | | | |
| * | | | | | Update externalized strings potMatija Čupić2017-12-051-22/+158
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/master' into list-multiple-clustersMatija Čupić2017-12-05188-670/+1546
| |\ \ \ \ \ \
| * | | | | | | Remove trailing whitespace from Clusters specMatija Čupić2017-12-051-13/+13
| | | | | | | |
| * | | | | | | Move can_toggle_cluster? from helper to presenterMatija Čupić2017-12-056-53/+47
| | | | | | | |
| * | | | | | | Mock Kaminari paginates_per instead of setting itMatija Čupić2017-12-051-1/+1
| | | | | | | |
| * | | | | | | Use ClustersFinder for setting countsMatija Čupić2017-12-052-9/+7
| | | | | | | |
| * | | | | | | Fix overwritten project.cluster replacementMatija Čupić2017-12-051-1/+1
| | | | | | | |
| * | | | | | | Fix empty state partial checkMatija Čupić2017-12-051-1/+1
| | | | | | | |
| * | | | | | | Fix rpsec all matchers in ClustersController specsMatija Čupić2017-12-051-2/+2
| | | | | | | |
| * | | | | | | Test for empty state partial instead of index viewMatija Čupić2017-12-051-1/+1
| | | | | | | |
| * | | | | | | Remove redundant view_clusters assignmentMatija Čupić2017-12-051-4/+2
| | | | | | | |
| * | | | | | | Replace Exception with ArgumentErrorMatija Čupić2017-12-051-1/+1
| | | | | | | |
| * | | | | | | Remove redundant return in Clusters::CreateServiceMatija Čupić2017-12-051-1/+1
| | | | | | | |
| * | | | | | | Revert node_modulesKamil Trzcinski2017-12-051-1/+0
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into list-multiple-clustersKamil Trzcinski2017-12-0529-70/+347
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/list-multiple-clusters' into ↵Kamil Trzcinski2017-12-058-9/+12
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cluster-page-with-list-clusters
| | * | | | | | | | Remove references of project.cluster from specsMatija Čupić2017-12-043-5/+5
| | | | | | | | | |
| | * | | | | | | | Remove cluster from Project modelMatija Čupić2017-12-042-2/+1
| | | | | | | | | |
| | * | | | | | | | Fix navbar CSSFilipa Lacerda2017-12-044-9/+14
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' into list-multiple-clustersFilipa Lacerda2017-12-04383-3368/+8601
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (154 commits) Don't disable the Rails mailer when seeding the test environment Documentation bug fixes: Added procedure to disable built-in Issues. Ensure `Namespace`'s is namespaced in `Gitlab::Kubernetes::Helm#initialize` and fix a transient failing spec due to that Add changelog entry Show only group name by default and put full namespace in tooltip Adds validation for Project#ci_config_path not to contain leading slash Gracefully handle case when repository's root ref does not exist Set EE variable issue note store allow caching options to be specified for counting services Update CHANGELOG.md for 10.2.3 Add link to gitaly converation Fix pipeline config source specs and test it explicitly Set an artificial $HOME for gitaly in test Add a fixture file that uses seed-fu in the test env so that a borken seed-fu is detected Pin seed-fu to 2.3.6 since 2.3.7 is broken Do not set pipeline source after initialization updated diff spec fix for special charecter in file names We could simply count the commits ...
| | * | | | | | | | | Use actual namespaceKamil Trzcinski2017-12-031-1/+1
| | | | | | | | | | |
View Lorry Controller Status