summaryrefslogtreecommitdiff
path: root/config/routes
Commit message (Collapse)AuthorAgeFilesLines
* Free up some group reserved wordsBob Van Landuyt2017-11-071-27/+30
|
* Free up `avatar`, `group_members` and `milestones` as pathsBob Van Landuyt2017-11-071-15/+16
|
* Free up `labels` as a group nameBob Van Landuyt2017-11-071-4/+10
|
* Fix wildcard route and use param styleShinya Maeda2017-11-071-1/+1
|
* Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-071-0/+1
|\
| * Merge branch '35616-move-gke-form-1st-iteration' into ↵Shinya Maeda2017-11-041-0/+1
| |\ | | | | | | | | | move-kubernetes-from-service-to-clusters-page-10-2-ver
| | * Fix pipeline. Fix routing when validation failed.Shinya Maeda2017-11-011-1/+1
| | |
| | * Fix paths to the first pageKamil Trzcinski2017-11-011-0/+1
| | |
* | | Add Projects::Clusters::ApplicationsController testsAlessio Caiazza2017-11-031-1/+1
| | |
* | | Fix typosAlessio Caiazza2017-11-031-1/+1
| | |
* | | Merge remote-tracking branch 'origin/master' into 38464-k8s-appsKamil Trzcinski2017-11-031-1/+0
|\ \ \ | |/ /
| * | Remove Private Token from User Settings > AccountDouwe Maan2017-11-021-1/+0
| | |
* | | Fix and add applications controllerKamil Trzcinski2017-11-021-2/+2
| | |
* | | Improve backend structure of dataKamil Trzcinski2017-11-021-0/+4
|/ /
* | Allow promoting project milestones to group milestonesFelipe Artur2017-10-311-0/+1
| |
* | Fix broken Members link when relative URL root paths are usedsh-fix-broken-redirection-relative-url-rootStan Hu2017-10-274-9/+9
|/ | | | | | | | Navigating to the "Members" section of a project would omit the relative URL root path. Fix the redirection and eliminate the need for a redirection in the first place. Fix other redirections failing to work with relative roots
* Added ssh fingerprint, gitlab ci and pages information in an instance ↵Francisco Lopez2017-10-251-4/+5
| | | | | | configuration page Closes #25142
* Backport EE changes to group routesbackort_routes_group_routes_from_eeValery Sizov2017-10-221-35/+35
|
* Fix inability to delete container registry tagsStan Hu2017-10-181-2/+7
| | | | | | | | Because container registry tags can have periods, the addition of the `.json` format caused ambiguity. Since the tag name regex is greedy, it would attempt to locate an image named `foo.json` instead of `foo`. Closes #39260
* Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-171-1/+2
|\ | | | | | | | | | | | | Show collapsible tree on the project show page Closes #30343 See merge request gitlab-org/gitlab-ce!14055
| * Nest the group_children_path inside the canonical group pathBob Van Landuyt2017-10-121-4/+2
| |
| * Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-103-1/+23
| |\
| * | Don't use canonical path for group childrenBob Van Landuyt2017-10-041-3/+4
| | |
| * | Update `children` route to handle projects and groupsBob Van Landuyt2017-10-041-0/+3
| | |
| * | Remove the subgroups path on a groupBob Van Landuyt2017-10-041-1/+0
| | |
* | | Merge branch 'move_markdown_preview_to_concern' into 'master'Sean McGivern2017-10-111-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add support for markdown preview to group milestones Closes #30241 See merge request gitlab-org/gitlab-ce!14806
| * | | Add support for markdown preview to group milestonesmove_markdown_preview_to_concernVitaliy @blackst0ne Klachkov2017-10-111-1/+3
| | |/ | |/|
* | | Add - before google_api/auth/callbackShinya Maeda2017-10-111-3/+5
|/ /
* | Change `/google_api/authorizations/` to `/google_api/auth/`.Kamil Trzcinski2017-10-051-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-10-051-1/+8
|\ \ | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * \ Merge branch 'master' into ↵Douwe Maan2017-10-051-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | digitalmoksha/gitlab-ce-feature/verify_secondary_emails # Conflicts: # app/controllers/admin/users_controller.rb # app/controllers/confirmations_controller.rb # app/controllers/profiles/emails_controller.rb # app/models/user.rb # app/services/emails/base_service.rb # app/services/emails/destroy_service.rb # app/views/devise/mailer/confirmation_instructions.html.haml # lib/api/users.rb # spec/services/emails/destroy_service_spec.rb
| * | moved devise_for :emails to live under `profiles`, removing the needBrett Walker2017-09-232-3/+3
| | | | | | | | | | | | for `emails` to be a top level route
| * | small cleanup changes based on feedbackBrett Walker2017-09-231-1/+1
| | |
| * | add verified/unverified labels to profile emails.Brett Walker2017-09-231-1/+5
| | | | | | | | | | | | added "Resend confirmation email" for unverified emails
| * | remove unnecessary devise_scopeBrett Walker2017-09-231-2/+0
| | |
| * | Send a confirmation email when the user adds a secondary email address. ↵Brett Walker2017-09-231-0/+5
| | | | | | | | | | | | Utilizes the Devise `confirmable` capabilities. Issue #37385
* | | Merge branch 'master' into ↵Shinya Maeda2017-10-051-1/+1
|\ \ \ | | |/ | |/| | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * | Add ContainerTag and ContainerRepository frontend APIKamil Trzcinski2017-09-211-1/+1
| |/
* | Implement Policy. Use show instead of edit. Chnage db column. fix comments. ↵Shinya Maeda2017-10-031-1/+1
| | | | | | | | dry up workers
* | Replace reactive_cache by multipel sidekiq workersShinya Maeda2017-10-011-1/+1
| |
* | Multithreading cluster creation is done with `reactive_cache`Shinya Maeda2017-09-281-0/+4
| |
* | Delete/Update basic implementationShinya Maeda2017-09-271-2/+1
| |
* | Add login root. Remove ceration type.Shinya Maeda2017-09-271-2/+1
| |
* | Tie KubernetesServiceShinya Maeda2017-09-261-1/+2
| |
* | Create Kubernetes cluster on GKE from k8s serviceShinya Maeda2017-09-252-0/+12
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-09-061-0/+2
|\ | | | | | | ee_issue_928_backport
| * Move "Move to different project" to sidebar34261-move-move-to-sidebarEric Eastwood2017-09-031-0/+1
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34261
| * Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-231-4/+0
| |\ | | | | | | | | | | | | # Conflicts: # package.json
| * \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-172-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # package.json # spec/support/features/reportable_note_shared_examples.rb
| * \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-101-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (42 commits) alternative route for download archive Add missing command to compile GetText files Prevent user from changing username with container registry tags Rename RPC 'Exists' to 'RepositoryExists' Fix the sticky changes bar on commits page Fix ee_compat_check when EE branch uses a prefix Removed display styles when hiding the fly out navigation Explain why we use select all for project_url_constrainer.rb Fix pikaday being undefined Add a helper to stub storage settings with defaults Enable the Layout/SpaceBeforeBlockBraces cop update Install from Source instructions Translations can be picked without asking for exceptions Ask for exceptions in advance Don't require stackprof in Gemfile Synchronous Korean translation in zanata Use full path of user's avatar in webhooks Update icon color on hover Align all nav items in sidebar Fix height of collapsed sidebar items ...