summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'remove-wiki-image-border-radius' into 'master' Fatih Acet2016-11-0410-10/+10
|\
| * Update avatar container name so it doesnt conflict with other image containersremove-wiki-image-border-radiusAnnabel Dunstone Gray2016-11-0310-10/+10
* | Merge branch 'fixed-width-caret' into 'master' Fatih Acet2016-11-041-1/+1
|\ \
| * | Add width to caret to rid ourselves of the shiftfixed-width-caretJacob Schatz2016-11-041-1/+1
* | | Merge branch 'stylistic-changes-to-commit-title-bar' into 'master' Fatih Acet2016-11-041-22/+22
|\ \ \
| * | | Update commit page stylesAnnabel Dunstone Gray2016-11-041-29/+28
| * | | added various changes to commit title areaDimitrie Hoekstra2016-11-041-46/+47
* | | | Merge branch 'issue_23032' into 'master' Sean McGivern2016-11-041-2/+5
|\ \ \ \
| * | | | Allow to test JIRA service when project does not have repositoryissue_23032Felipe Artur2016-11-041-2/+5
| |/ / /
* | | | Merge branch 'show-status-from-branch' into 'master' Rémy Coutable2016-11-0410-19/+22
|\ \ \ \
| * | | | Fetch locals to avoid undefined method/local errorshow-status-from-branchLin Jen-Shin2016-11-043-0/+3
| * | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-0422-28/+32
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-0436-113/+121
| |\ \ \ \ \
| * | | | | | Merge status_for and status, feedback:Lin Jen-Shin2016-11-032-3/+3
| * | | | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-0226-152/+316
| |\ \ \ \ \ \
| * | | | | | | Always use multiline in viewLin Jen-Shin2016-10-281-1/+2
| * | | | | | | Use multi-line conditions in view, feedback:Lin Jen-Shin2016-10-281-1/+2
| * | | | | | | Also pass ref hereLin Jen-Shin2016-10-271-1/+1
| * | | | | | | Also update for default project page, feedback:Lin Jen-Shin2016-10-273-7/+8
| * | | | | | | Still show status from pipelines, see:Lin Jen-Shin2016-10-271-2/+2
| * | | | | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-10-2611-16/+188
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-10-255-7/+8
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Pass `@ref` along so we know which pipeline to showLin Jen-Shin2016-10-247-11/+8
* | | | | | | | | | Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master' Douwe Maan2016-11-043-1/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Add setting to only allow merge requests to be merged when all discussions ar...Rodolfo Santos2016-11-043-1/+13
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch '22588-todos-filter-shows-all-users' into 'master' Sean McGivern2016-11-041-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix: Todos Filter Shows All Users22588-todos-filter-shows-all-usersValery Sizov2016-11-041-1/+1
* | | | | | | | | Merge branch '24056-guest-sees-some-project-details-and-gets-404' into 'master' Sean McGivern2016-11-041-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix: Guest sees some repository details and gets 404Valery Sizov2016-11-041-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '24059-round-robin-repository-storage' into 'master' Douwe Maan2016-11-041-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Allow multiple repository storage shards to be enabled, and automatically rou...Nick Thomas2016-11-041-2/+2
* | | | | | | | Merge branch '22947-fix_issues_atom_feed_url' into 'master' Rémy Coutable2016-11-046-9/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Issues atom feed url reflect filters on dashboard22947-fix_issues_atom_feed_urlLucas Deschamps2016-11-036-9/+9
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch '24022-update-styling-commit-sha-in-branches-list' into 'master' Fatih Acet2016-11-041-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | updated styling commit SHA on branches page + added to changelogDimitrie Hoekstra2016-11-041-0/+2
* | | | | | | | | Merge branch '23979-show-environment-log' into 'master' Sean McGivern2016-11-041-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Show log corresponding to env in admin/logsLukas Erlacher2016-11-031-1/+1
* | | | | | | | | Cleaned up global namespace JSJosé Iván2016-11-032-2/+2
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge branch '22914-mini-graph-icons' into 'master' Fatih Acet2016-11-034-3/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Add new icon for skipped builds; show created state in mini graphAnnabel Dunstone Gray2016-11-034-3/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'project-container-repo-disable' into 'master' Fatih Acet2016-11-031-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Hides registry if project is disabledPhil Hughes2016-11-011-2/+2
* | | | | | | | | Merge branch 'file-toggle' into 'master' Fatih Acet2016-11-032-5/+5
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Unify dropdown button stylesfile-toggleAnnabel Dunstone Gray2016-11-032-5/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '24133-custom-signin-text-alignment' into 'master' Fatih Acet2016-11-031-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Add custom text to column24133-custom-signin-text-alignmentAnnabel Dunstone Gray2016-11-031-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch '24102-cannot-unselect-remove-source-branch-when-editing-merge-r...Sean McGivern2016-11-031-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Ensure merge request's "remove branch" accessors return booleans24102-cannot-unselect-remove-source-branch-when-editing-merge-requestRémy Coutable2016-11-031-0/+1
| |/ / / / / /
* | | | | | | Merge branch 'group-name-validation' into 'master' Alfredo Sumaran2016-11-0313-15/+17
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Initialize form validation on new group form.group-name-validationBryce Johnson2016-11-021-1/+1