| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'bvl-fix-locale-path' into 'master' | Tim Zallmann | 2017-10-18 | 1 | -0/+4 |
| |\ | | | | | | | | | | | | | Render region codes for locale assets with an `_` instead of a `-` Closes #39225 See merge request gitlab-org/gitlab-ce!14924 | ||||
| | * | Build the locale path with an `_` instead of a `-` | Bob Van Landuyt | 2017-10-18 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | The locale code is turned into an asset path with an underscore instead of a dash. The language codes are transformed by `I18n.locale` into a code with a dash. But the resources for translating are always stored in a path using a `_` separating the language and the region code. | ||||
| * | | Merge branch '30140-restore-readme-only-preference' into 'master' | Douwe Maan | 2017-10-18 | 1 | -1/+2 |
| |\ \ | |/ |/| | | | | | | | | | Add readme only option as project view Closes #30140 See merge request gitlab-org/gitlab-ce!14900 | ||||
| | * | Add readme only option as project view | Annabel Dunstone Gray | 2017-10-16 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'bvl-circuitbreaker-improvements' into 'master' | Douwe Maan | 2017-10-17 | 1 | -0/+32 |
| |\ \ | | | | | | | | | | | | | Make the circuitbreaker configurable at runtime See merge request gitlab-org/gitlab-ce!14842 | ||||
| | * | | Allow configuring the circuitbreaker through the API and UI | Bob Van Landuyt | 2017-10-17 | 1 | -0/+32 |
| | |/ | |||||
| * | | Merge branch 'bvl-group-trees' into 'master' | Douwe Maan | 2017-10-17 | 1 | -0/+11 |
| |\ \ | |/ |/| | | | | | | | | | Show collapsible tree on the project show page Closes #30343 See merge request gitlab-org/gitlab-ce!14055 | ||||
| | * | Merge branch 'master' into bvl-group-trees | Bob Van Landuyt | 2017-10-10 | 8 | -6/+31 |
| | |\ | |||||
| | * | | Groups tree enhancements for Groups Dashboard and Group Homepage | Kushal Pandya | 2017-10-04 | 1 | -0/+11 |
| | | | | |||||
| * | | | Cache issuable template names | Sean McGivern | 2017-10-12 | 1 | -10/+2 |
| | |/ |/| | | | | | | | | | | | We were looking these up on each request to an issue page, because the form is pre-filled, as is the template dropdown. That was unnecessary: we could just treat these as 'special' repository files (like the rendered README) and cache them in Redis until they change on a push. | ||||
| * | | Stop using `branch_names.include?` and use `branch_exists?` | Andrew Newdigate | 2017-10-10 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master' | Douwe Maan | 2017-10-10 | 2 | -2/+8 |
| |\ \ | | | | | | | | | | | | | | | | | | | Resolve "Private Avatars are not CDN compatible" Closes #38245 and gitlab-com/support-forum#2476 See merge request gitlab-org/gitlab-ce!14443 | ||||
| | * | | Changed Group Icon URL Back to try option38245-private-avatars-are-not-cdn-compatible | Tim Zallmann | 2017-10-10 | 1 | -5/+1 |
| | | | | |||||
| | * | | Fix for Lint Error + Upload Test | Tim Zallmann | 2017-10-09 | 1 | -1/+0 |
| | | | | |||||
| | * | | Based on MR simplified the logic | Tim Zallmann | 2017-10-09 | 2 | -15/+3 |
| | | | | |||||
| | * | | Removed 2 uncommented lines | Tim Zallmann | 2017-10-06 | 1 | -2/+0 |
| | | | | |||||
| | * | | Fixed Linting Error | Tim Zallmann | 2017-10-05 | 1 | -8/+0 |
| | | | | |||||
| | * | | Another Change for cleanup | Tim Zallmann | 2017-10-05 | 1 | -6/+0 |
| | | | | |||||
| | * | | Updates based on MR comments | Tim Zallmann | 2017-10-05 | 2 | -11/+16 |
| | | | | |||||
| | * | | Fixed Tests | Tim Zallmann | 2017-10-04 | 1 | -5/+6 |
| | | | | |||||
| | * | | Fixed Test | Tim Zallmann | 2017-10-04 | 1 | -3/+3 |
| | | | | |||||
| | * | | Fixed Linting errors + tests | Tim Zallmann | 2017-10-04 | 1 | -1/+1 |
| | | | | |||||
| | * | | Created group_icon and group_icon_url | Tim Zallmann | 2017-10-04 | 1 | -5/+24 |
| | | | | | | | | | | | | | Tests for these new helper methods | ||||
| | * | | Making private project avatars use local paths + Some Group Icons | Tim Zallmann | 2017-10-04 | 3 | -4/+18 |
| | |/ | |||||
| * | | Allow creating merge requests across forks of a project | Bob Van Landuyt | 2017-10-07 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'add-1000-plus-counters-for-jobs-page' into 'master' | Yorick Peterse | 2017-10-06 | 1 | -0/+11 |
| |\ \ | | | | | | | | | | | | | Add 1000 plus counters for jobs page See merge request gitlab-org/gitlab-ce!14507 | ||||
| | * | | Add 1000+ counters (instead of inifnite) to jobs controlleradd-1000-plus-counters-for-jobs-page | Kamil Trzcinski | 2017-10-06 | 1 | -0/+11 |
| | | | | |||||
| * | | | Merge branch ↵ | Kamil Trzciński | 2017-10-06 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' into 'master' Create Kubernetes cluster on GKE from k8s service Closes #35954 See merge request gitlab-org/gitlab-ce!14470 | ||||
| | * \ \ | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-05 | 1 | -9/+11 |
| | |\ \ \ | | | |/ | | |/| | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| | * | | | Introduce policy check for clusters navigation option | Kamil Trzcinski | 2017-10-03 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch '18608-lock-issues-v2' into 'master' | Sean McGivern | 2017-10-06 | 2 | -1/+7 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Resolve "Lock issue and merge request" Closes #18608 See merge request gitlab-org/gitlab-ce!14531 | ||||
| | * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Jarka Kadlecova | 2017-10-03 | 6 | -18/+26 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18608-lock-issues-v2 # Conflicts: # db/schema.rb | ||||
| | * | | | | Fix locked and unlocked icons | Luke "Jared" Bennett | 2017-09-27 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | add discussion lock icon to the system_note_helper | Jarka Kadlecova | 2017-09-26 | 1 | -1/+3 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issues | Jarka Kadlecova | 2017-09-25 | 8 | -173/+230 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/notes/components/issue_comment_form.vue | ||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/master' into 18608-lock-issues | Luke "Jared" Bennett | 2017-09-20 | 3 | -5/+34 |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | | Merge remote-tracking branch 'origin/master' into 18608-lock-issues | Luke "Jared" Bennett | 2017-09-18 | 1 | -4/+0 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Support discussion locking in the backend | Jarka Kadlecova | 2017-09-14 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | Updated Profile Events Helper to use SVG Sprite Icons | Tim Zallmann | 2017-10-04 | 1 | -9/+11 |
| | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | | Merge branch 'dm-copy-parallel-diff' into 'master' | Phil Hughes | 2017-10-03 | 1 | -7/+9 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | Only copy old/new code when selecting left/right side of parallel diff See merge request gitlab-org/gitlab-ce!14561 | ||||
| | * | | | | | Only copy old/new code when selecting left/right side of parallel diffdm-copy-parallel-diff | Douwe Maan | 2017-10-02 | 1 | -7/+9 |
| | | | | | | | |||||
| * | | | | | | Merge branch ↵ | Tim Zallmann | 2017-10-02 | 1 | -2/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34366-issue-sidebar-don-t-render-participants-in-collapsed-state' into 'master' Resolve "Issue Sidebar : Don't render participants in collapsed state" Closes #34366 See merge request gitlab-org/gitlab-ce!14270 | ||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into ↵ | Luke "Jared" Bennett | 2017-09-28 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | 34366-issue-sidebar-don-t-render-participants-in-collapsed-state | ||||
| | * | | | | | | Add lazy_load option to participant avatar helper | Luke "Jared" Bennett | 2017-09-28 | 1 | -2/+5 |
| | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | | Merge branch 'icons-update-nav-bars' into 'master' | Phil Hughes | 2017-09-29 | 2 | -3/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated All Navigation Icons to Sprite_Icons See merge request gitlab-org/gitlab-ce!14559 | ||||
| | * | | | | | | Updated All Navigation Icons to Sprite_Icons | Tim Zallmann | 2017-09-28 | 2 | -3/+3 |
| | |/ / / / / | |||||
| * | | | | | | Merge branch 'dm-json-page-title' into 'master' | Jacob Schatz | 2017-09-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use backend-provided page title in repo editor Closes #36029 See merge request gitlab-org/gitlab-ce!13763 | ||||
| | * | | | | | | Add Page-Title header to tree and blob JSON endpoints | Douwe Maan | 2017-09-26 | 1 | -1/+1 |
| | |/ / / / / | |||||
| * | | | | | | Merge branch 'breadcrumb-item-links' into 'master' | Tim Zallmann | 2017-09-29 | 1 | -5/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed breadcrumb title not linking Closes #38059 See merge request gitlab-org/gitlab-ce!14532 | ||||
| | * | | | | | | Fixed breadcrumb title not linking | Phil Hughes | 2017-09-27 | 1 | -5/+1 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the breadcrumb titles not having links. This was a regression in the updated breadcrumbs introduced in 10.0. This introduces the link for all pages rather than selectively doing it. This will cover issues, merge requests, pipelines, jobs etc. Closes #38059 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |