summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Incorporate feedbackee/ee-34102-online-view-of-artifacts-feZeger-Jan van de Weg2017-10-041-2/+3
* Dry up external_link? usageEric Eastwood2017-10-041-9/+8
* Add translation method to external artifact tooltipEric Eastwood2017-10-031-1/+1
* Redirect to pages daemonZeger-Jan van de Weg2017-10-031-2/+2
* Add test for external HTML artifactEric Eastwood2017-10-031-1/+1
* Use CSS to space external link icon from textEric Eastwood2017-10-031-2/+1
* Add changelog for online view of HTML artifactsEric Eastwood2017-10-031-1/+1
* Backend for HTML serving with GitLab PagesZeger-Jan van de Weg2017-10-031-4/+3
* Add external link FE for online artifactsEric Eastwood2017-10-031-4/+13
* Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-09-29Lin Jen-Shin2017-09-298-32/+13
|\
| * 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
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Use relative paths for opening and closing issuablesbvl-fix-close-issuable-linkBob Van Landuyt2017-09-282-5/+5
| * | | | Merge branch '13637-show-account-confirmation-link-in-e-mail-text' into 'master'Phil Hughes2017-09-281-2/+3
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Changed account confirmation line to e-mail text. This MR fixes issue #13637bitsapien2017-09-281-2/+3
| | |/ /
| * | | Fixed missing namespaces on navigation translationsfix-translation-namespacesPhil Hughes2017-09-271-1/+1
| |/ /
* | | Merge branch 'ce-to-ee-2017-09-27' into 'master'Rémy Coutable2017-09-291-5/+5
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-09-27Rémy Coutable2017-09-282-12/+12
| |\ \ \
| * | | | Resolve conflict in app/views/shared/boards/_show.html.hamlWinnie Hellmann2017-09-271-6/+1
| * | | | Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-09-27Rémy Coutable2017-09-272-7/+12
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '3523-i18n-autodevops' into 'master'Douwe Maan2017-09-271-5/+5
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Improves variable nameFilipa Lacerda2017-09-271-1/+1
| | | * | Improves i18n for Auto Devops calloutFilipa Lacerda2017-09-261-5/+5
| | * | | Make issue boards sidebar full heightWinnie Hellmann2017-09-261-4/+4
| | |/ /
* | | | Merge branch 'ee-fix-translation-namespaces' into 'master'Filipa Lacerda2017-09-281-1/+1
|\ \ \ \
| * | | | EE port of fix-translation-namespacesPhil Hughes2017-09-281-1/+1
* | | | | Merge branch 'feature/ldap-group-filter' into 'master'Douwe Maan2017-09-287-21/+46
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix member listJames Lopez2017-09-281-2/+2
| * | | | Adds row class as parent to col-* classes to match boostrap documentationFilipa Lacerda2017-09-271-17/+14
| * | | | refactor JS codeJames Lopez2017-09-271-0/+2
| * | | | fix filter length on admin screenJames Lopez2017-09-251-1/+1
| * | | | fix ldap group link and add some debug infoJames Lopez2017-09-255-8/+7
| * | | | fix ldap group link and add some debug infoJames Lopez2017-09-251-1/+1
| * | | | update viewsJames Lopez2017-09-253-5/+32
* | | | | Merge branch '37494-group-tab-member-lock' into 'master'Phil Hughes2017-09-281-7/+9
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Show group tab if member lock is enabledAnnabel Dunstone Gray2017-09-271-7/+9
| | |/ / | |/| |
* | | | Merge branch 'winh-full-height-boards-sidebar-ee'Robert Speicher2017-09-273-16/+16
|\ \ \ \ | |/ / / |/| | |
| * | | Replace @click/@submit with v-on in HAMLWinnie Hellmann2017-09-262-12/+12
| * | | Make issue boards sidebar full heightWinnie Hellmann2017-09-261-4/+4
* | | | [CE->EE] Conflicts resolving. Part 2Valery Sizov2017-09-265-15/+0
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstreamValery Sizov2017-09-2619-4/+28
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge branch 'remove-old-nav-styles' into 'master'Phil Hughes2017-09-2690-399/+0
| |\ \
| | * | Fix specsAnnabel Dunstone Gray2017-09-253-3/+1