Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Free up some group reserved words | Bob Van Landuyt | 2017-11-07 | 1 | -27/+30 |
| | |||||
* | Free up `avatar`, `group_members` and `milestones` as paths | Bob Van Landuyt | 2017-11-07 | 1 | -15/+16 |
| | |||||
* | Free up `labels` as a group name | Bob Van Landuyt | 2017-11-07 | 1 | -4/+10 |
| | |||||
* | Fix wildcard route and use param style | Shinya Maeda | 2017-11-07 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into 38464-k8s-apps | Shinya Maeda | 2017-11-07 | 1 | -0/+1 |
|\ | |||||
| * | Merge branch '35616-move-gke-form-1st-iteration' into ↵ | Shinya Maeda | 2017-11-04 | 1 | -0/+1 |
| |\ | | | | | | | | | | move-kubernetes-from-service-to-clusters-page-10-2-ver | ||||
| | * | Fix pipeline. Fix routing when validation failed. | Shinya Maeda | 2017-11-01 | 1 | -1/+1 |
| | | | |||||
| | * | Fix paths to the first page | Kamil Trzcinski | 2017-11-01 | 1 | -0/+1 |
| | | | |||||
* | | | Add Projects::Clusters::ApplicationsController tests | Alessio Caiazza | 2017-11-03 | 1 | -1/+1 |
| | | | |||||
* | | | Fix typos | Alessio Caiazza | 2017-11-03 | 1 | -1/+1 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into 38464-k8s-apps | Kamil Trzcinski | 2017-11-03 | 1 | -1/+0 |
|\ \ \ | |/ / | |||||
| * | | Remove Private Token from User Settings > Account | Douwe Maan | 2017-11-02 | 1 | -1/+0 |
| | | | |||||
* | | | Fix and add applications controller | Kamil Trzcinski | 2017-11-02 | 1 | -2/+2 |
| | | | |||||
* | | | Improve backend structure of data | Kamil Trzcinski | 2017-11-02 | 1 | -0/+4 |
|/ / | |||||
* | | Allow promoting project milestones to group milestones | Felipe Artur | 2017-10-31 | 1 | -0/+1 |
| | | |||||
* | | Fix broken Members link when relative URL root paths are usedsh-fix-broken-redirection-relative-url-root | Stan Hu | 2017-10-27 | 4 | -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 Lopez | 2017-10-25 | 1 | -4/+5 |
| | | | | | | configuration page Closes #25142 | ||||
* | Backport EE changes to group routesbackort_routes_group_routes_from_ee | Valery Sizov | 2017-10-22 | 1 | -35/+35 |
| | |||||
* | Fix inability to delete container registry tags | Stan Hu | 2017-10-18 | 1 | -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 Maan | 2017-10-17 | 1 | -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 path | Bob Van Landuyt | 2017-10-12 | 1 | -4/+2 |
| | | |||||
| * | Merge branch 'master' into bvl-group-trees | Bob Van Landuyt | 2017-10-10 | 3 | -1/+23 |
| |\ | |||||
| * | | Don't use canonical path for group children | Bob Van Landuyt | 2017-10-04 | 1 | -3/+4 |
| | | | |||||
| * | | Update `children` route to handle projects and groups | Bob Van Landuyt | 2017-10-04 | 1 | -0/+3 |
| | | | |||||
| * | | Remove the subgroups path on a group | Bob Van Landuyt | 2017-10-04 | 1 | -1/+0 |
| | | | |||||
* | | | Merge branch 'move_markdown_preview_to_concern' into 'master' | Sean McGivern | 2017-10-11 | 1 | -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_concern | Vitaliy @blackst0ne Klachkov | 2017-10-11 | 1 | -1/+3 |
| | |/ | |/| | |||||
* | | | Add - before google_api/auth/callback | Shinya Maeda | 2017-10-11 | 1 | -3/+5 |
|/ / | |||||
* | | Change `/google_api/authorizations/` to `/google_api/auth/`. | Kamil Trzcinski | 2017-10-05 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into ↵ | Kamil Trzcinski | 2017-10-05 | 1 | -1/+8 |
|\ \ | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| * \ | Merge branch 'master' into ↵ | Douwe Maan | 2017-10-05 | 1 | -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 need | Brett Walker | 2017-09-23 | 2 | -3/+3 |
| | | | | | | | | | | | | for `emails` to be a top level route | ||||
| * | | small cleanup changes based on feedback | Brett Walker | 2017-09-23 | 1 | -1/+1 |
| | | | |||||
| * | | add verified/unverified labels to profile emails. | Brett Walker | 2017-09-23 | 1 | -1/+5 |
| | | | | | | | | | | | | added "Resend confirmation email" for unverified emails | ||||
| * | | remove unnecessary devise_scope | Brett Walker | 2017-09-23 | 1 | -2/+0 |
| | | | |||||
| * | | Send a confirmation email when the user adds a secondary email address. ↵ | Brett Walker | 2017-09-23 | 1 | -0/+5 |
| | | | | | | | | | | | | Utilizes the Devise `confirmable` capabilities. Issue #37385 | ||||
* | | | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-05 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| * | | Add ContainerTag and ContainerRepository frontend API | Kamil Trzcinski | 2017-09-21 | 1 | -1/+1 |
| |/ | |||||
* | | Implement Policy. Use show instead of edit. Chnage db column. fix comments. ↵ | Shinya Maeda | 2017-10-03 | 1 | -1/+1 |
| | | | | | | | | dry up workers | ||||
* | | Replace reactive_cache by multipel sidekiq workers | Shinya Maeda | 2017-10-01 | 1 | -1/+1 |
| | | |||||
* | | Multithreading cluster creation is done with `reactive_cache` | Shinya Maeda | 2017-09-28 | 1 | -0/+4 |
| | | |||||
* | | Delete/Update basic implementation | Shinya Maeda | 2017-09-27 | 1 | -2/+1 |
| | | |||||
* | | Add login root. Remove ceration type. | Shinya Maeda | 2017-09-27 | 1 | -2/+1 |
| | | |||||
* | | Tie KubernetesService | Shinya Maeda | 2017-09-26 | 1 | -1/+2 |
| | | |||||
* | | Create Kubernetes cluster on GKE from k8s service | Shinya Maeda | 2017-09-25 | 2 | -0/+12 |
|/ | |||||
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Simon Knox | 2017-09-06 | 1 | -0/+2 |
|\ | | | | | | | ee_issue_928_backport | ||||
| * | Move "Move to different project" to sidebar34261-move-move-to-sidebar | Eric Eastwood | 2017-09-03 | 1 | -0/+1 |
| | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34261 | ||||
| * | Merge branch 'master' into issue-discussions-refactor | Douwe Maan | 2017-08-23 | 1 | -4/+0 |
| |\ | | | | | | | | | | | | | # Conflicts: # package.json | ||||
| * \ | Merge branch 'master' into issue-discussions-refactor | Douwe Maan | 2017-08-17 | 2 | -3/+3 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # package.json # spec/support/features/reportable_note_shared_examples.rb | ||||
| * \ \ | Merge branch 'master' into issue-discussions-refactor | Filipa Lacerda | 2017-08-10 | 1 | -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 ... |