summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'use-separate-token-for-incoming-email' into 'master' Douwe Maan2016-11-082-17/+36
|\
| * implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-emailtiagonbotelho2016-11-072-28/+42
| * Use separate email-friendly token for incoming email and let incomingDouwe Maan2016-11-071-15/+20
* | Merge branch 'todos-filter-empty-state' into 'master' Sean McGivern2016-11-081-9/+13
|\ \
| * | Changed helper method to check for none on paramsPhil Hughes2016-11-081-5/+5
| * | Fixed todos empty state when filteringtodos-filter-empty-statePhil Hughes2016-11-071-8/+12
* | | Merge branch 'fix-404-on-network-when-entering-a-nonexistent-git-revision' in...Sean McGivern2016-11-081-2/+3
|\ \ \
| * | | Fix bug of json request urlHiroyuki Sato2016-11-071-1/+1
| * | | Remove 'extended_sha1' option from ExtractsPath moduleHiroyuki Sato2016-11-061-1/+1
| * | | Network page appear with an error message when entering nonexistent git revisionHiroyuki Sato2016-11-061-2/+3
| | |/ | |/|
* | | 17492 Update link color for more accessible contrast17492-link-contrasttauriedavis2016-11-072-13/+13
* | | Use the Gitlab Workhorse HTTP header in the admin dashboard21664-incorrect-workhorse-version-number-displayedChris Wright2016-11-071-1/+1
* | | Merge branch 'jacobvosmaer-gitlab/gitlab-ce-git-gc-improvements' into 'master' Douwe Maan2016-11-071-0/+39
|\ \ \ | |_|/ |/| |
| * | Refine Git garbage collectionJacob Vosmaer2016-11-041-0/+39
* | | Merge branch 'refactor-issuable-form-template_selector' into 'master' Robert Speicher2016-11-072-17/+17
|\ \ \ | |_|/ |/| |
| * | Refactor template selector in issuable formrefactor-issuable-form-template_selectorRémy Coutable2016-11-042-17/+17
* | | 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
|\ \ \ \ \ \ \ \
View Lorry Controller Status