summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '31050-registry-image-lists' into 'master'Grzegorz Bizon2017-10-042-84/+41
|\
| * Merge branch 'master' into 31050-registry-image-listsFilipa Lacerda2017-09-2891-408/+9
| |\
| * \ Merge branch 'master' into 31050-registry-image-listsFilipa Lacerda2017-09-2647-273/+144
| |\ \
| * | | Moves table component into a separate oneFilipa Lacerda2017-09-251-13/+6
| * | | Changes after reviewFilipa Lacerda2017-09-251-3/+3
| * | | Change layout orderFilipa Lacerda2017-09-221-7/+8
| * | | Removes unused fileFilipa Lacerda2017-09-221-32/+0
| * | | Adds paginationFilipa Lacerda2017-09-221-2/+2
| * | | Merge branch 'master' into 31050-registry-image-listsFilipa Lacerda2017-09-2219-165/+50
| |\ \ \
| * | | | [ci skip] Adds tests to vuex and collapsibe componentFilipa Lacerda2017-09-201-6/+3
| * | | | Removes 2 column layout. Adds i18n supportFilipa Lacerda2017-09-191-55/+47
| * | | | [ci skip] First iteration: port haml into vueFilipa Lacerda2017-09-191-6/+12
* | | | | Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master'Douwe Maan2017-10-041-2/+2
|\ \ \ \ \
| * | | | | Reduce method calls while evaluating Projects::MergeRequestsController#show.json36876-mr-show-json-controller-perf-improvementsOswaldo Ferreira2017-10-041-2/+2
* | | | | | Merge branch '38187-38315-fix-dropdown-open-top-bottom-spacing' into 'master'Annabel Dunstone Gray2017-10-031-1/+1
|\ \ \ \ \ \
| * | | | | | Fix bottom spacing for dropdowns that open upwards38187-38315-fix-dropdown-open-top-bottom-spacingEric Eastwood2017-10-031-1/+1
* | | | | | | Hide Gollum inside Gitlab::Git::WikiJacob Vosmaer (GitLab)2017-10-032-3/+3
* | | | | | | Merge branch '36670-remove-edit-form' into 'master'Sean McGivern2017-10-031-7/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove edit action for issuesJarka Kadlecova2017-10-031-7/+0
* | | | | | | | Merge branch 'dm-copy-parallel-diff' into 'master'Phil Hughes2017-10-032-24/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Only copy old/new code when selecting left/right side of parallel diffdm-copy-parallel-diffDouwe Maan2017-10-022-24/+23
* | | | | | | | | Merge branch 'ff_port_from_ee' into 'master'Sean McGivern2017-10-033-0/+41
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_eeValery Sizov2017-10-0226-117/+95
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Port semi-linear merge strategy to CE (mostly FE)Eric Eastwood2017-09-292-0/+15
| * | | | | | | | | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-285-13/+14
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-26144-718/+184
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Port fast-forward merge request setting from EEEric Eastwood2017-09-193-22/+26
| * | | | | | | | | | | Fast forward merge: basic implemenation[ci skip]Valery Sizov2017-09-191-0/+22
* | | | | | | | | | | | Merge branch '38641-repo-editor-callout' into 'master'Jacob Schatz2017-10-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Removes auto devops callout from repo editor viewFilipa Lacerda2017-10-021-1/+1
* | | | | | | | | | | | Merge branch '34366-issue-sidebar-don-t-render-participants-in-collapsed-stat...Tim Zallmann2017-10-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into 34366-issue-sidebar-don-t-r...Luke "Jared" Bennett2017-09-28102-411/+14
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Add lazy_load option to participant avatar helperLuke "Jared" Bennett2017-09-281-1/+1
* | | | | | | | | | | | Merge branch 'fork-btn-enabled-user-groups' into 'master'Filipa Lacerda2017-09-292-8/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | moved fork checks into policiesfork-btn-enabled-user-groupsPhil Hughes2017-09-292-9/+8
| * | | | | | | | | | | | Fix fork button being disabled for users who can fork to groupPhil Hughes2017-09-292-8/+12
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jramsay-4012-externalize-wiki-strings' into 'master'38609-generalise-pop-overs-to-work-on-hover-and-implement-in-existing-placesDouwe Maan2017-09-2911-62/+58
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add translatable strings to wiki pagesjramsay-4012-externalize-wiki-stringsJames Ramsay2017-09-2811-62/+58
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'icons-update-nav-bars' into 'master'Phil Hughes2017-09-298-21/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixed another linting error this time HAMLTim Zallmann2017-09-281-1/+1
| * | | | | | | | | | | Updated All Navigation Icons to Sprite_IconsTim Zallmann2017-09-288-21/+20
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'first-time-contributor-tooltip-text' into 'master'Filipa Lacerda2017-09-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Tweaked the first time contributor tooltip textfirst-time-contributor-tooltip-textPhil Hughes2017-09-281-1/+1
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'breadcrumb-item-links' into 'master'Tim Zallmann2017-09-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed breadcrumb title not linkingPhil Hughes2017-09-271-1/+1
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'remove-target-dd' into 'master'Filipa Lacerda2017-09-292-20/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove target ref switcher.Jacob Schatz2017-09-282-20/+0
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '37335-counter-active-state' into 'master'Phil Hughes2017-09-291-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add active states to nav bar counters37335-counter-active-stateAnnabel Dunstone Gray2017-09-281-3/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'bvl-fix-close-issuable-link' into 'master'Rémy Coutable2017-09-282-5/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |