summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into ux/suppress-ci-yml-warningGrzegorz Bizon2015-12-147-57/+32
|\
| * Merge branch 'ci-project-migrate' into 'master' Kamil TrzciƄski2015-12-147-57/+32
| |\
| | * Update badgeKamil Trzcinski2015-12-111-2/+4
| | * Finishing touchesKamil Trzcinski2015-12-111-11/+0
| | * Reimplement Trigger APIKamil Trzcinski2015-12-111-2/+2
| | * Remove ci_ prefix from all ci related thingsKamil Trzcinski2015-12-111-1/+1
| | * Migrate CI::Project to ProjectKamil Trzcinski2015-12-117-55/+39
* | | Add matcher class to ci status linkGrzegorz Bizon2015-12-141-1/+1
|/ /
* | display referenced merge requests in issue description with CI statusgsmethells/gitlab-ce-mr-statusesGreg Smethells2015-12-111-1/+1
|/
* Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-cachingDouwe Maan2015-12-106-39/+59
|\
| * Merge remote-tracking branch 'origin/mr-broken'Dmitriy Zaporozhets2015-12-091-1/+1
| |\
| | * Merge branch 'master' into mr-brokenDouwe Maan2015-12-083-3/+29
| | |\
| | * | Use "Build passed" in tooltip instead of "Build status: passed"Douwe Maan2015-12-081-1/+1
| * | | Merge branch 'master' into default_clone_protocol_based_on_user_keysEirik Lygre2015-12-099-38/+94
| |\ \ \
| | * | | Improve text indication visibility on snippetsZeger-Jan van de Weg2015-12-081-11/+15
| | * | | Merge branch 'edit-in-patch-branch' into 'master' Robert Speicher2015-12-083-25/+33
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Only show Edit button for text blobs.edit-in-patch-branchDouwe Maan2015-12-081-2/+2
| | | * | Show tooltip when trying to edit file when not on branchDouwe Maan2015-12-082-25/+26
| | | * | Default target branch to patch-n when editing file in protected branchDouwe Maan2015-12-082-4/+11
| | | |/
| * | | Simplify expression per feedback from @rspeicherEirik Lygre2015-12-071-3/+1
| * | | When rendering the clone page, check user profile to decide default clone pro...Eirik Lygre2015-12-061-2/+12
* | | | Merge branch 'reference-pipeline-and-caching' into 'master' Robert Speicher2015-12-081-35/+25
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-cachingDouwe Maan2015-12-081-1/+1
| |\ \ \
| * \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-0710-67/+74
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-033-5/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-027-22/+92
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-11-1915-113/+72
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-10-273-18/+17
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-10-2110-16/+58
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-141-15/+11
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-142-2/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use Gitlab::Markdown for Asciidoc and ReferenceExtractor pipelinesDouwe Maan2015-10-141-6/+9
| * | | | | | | | | | | | Use Gitlab::Markdown.render with :pipeline option rather than different methodsDouwe Maan2015-10-141-27/+10
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/ui/misc'Dmitriy Zaporozhets2015-12-082-3/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ui/miscui/miscDouwe Maan2015-12-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into ui/miscDouwe Maan2015-12-0710-67/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into ui/miscDouwe Maan2015-12-033-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | "CI build passed", not "CI build success"Douwe Maan2015-12-021-2/+14
| * | | | | | | | | | | | | Separate page title segments by middot rather than pipeDouwe Maan2015-12-021-1/+2
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'master' into ui/dashboard-new-issueui/dashboard-new-issueDouwe Maan2015-12-083-2/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'serve_lfs_object' into 'master' Douwe Maan2015-12-082-1/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Rename blob helper, bump version of gitlab_git to 7.2.21.Marin Jankovski2015-12-071-3/+3
| | * | | | | | | | | | | Add specs for showing lfs object in UI.Marin Jankovski2015-12-072-1/+17
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'pberndt:master' into 'master' Robert Speicher2015-12-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | time_ago_with_tooltip javascript snippet: Don't reinitialize older elementsPhillip Berndt2015-12-031-1/+1
* | | | | | | | | | | | Merge branch 'master' into ui/dashboard-new-issueDouwe Maan2015-12-0710-67/+74
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'master' into gsmethells/gitlab-ce-sort-by-due-dategsmethells/gitlab-ce-sort-by-due-dateDouwe Maan2015-12-079-66/+71
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 'link-refs' into 'master' Robert Speicher2015-12-042-2/+10
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into link-refsDouwe Maan2015-12-033-5/+5
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | * | | | | | | | | | Show local issues and MRs in "This X closes... / closed by..." sentenceDouwe Maan2015-11-302-2/+10
| | | | |_|/ / / / / / / | | | |/| | | | | | | |