summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* changes verb `references` to noun `reference`.cross-project-reference-typo-fixJacob Schatz2016-01-081-1/+1
|
* Merge branch 'cross-project-reference-move' into 'master' Dmitriy Zaporozhets2016-01-081-9/+10
|\ | | | | | | | | | | | | | | | | adds reference to the bottom of sidebar Fixes #4183 ![Screen_Shot_2016-01-07_at_3.17.32_PM](/uploads/8d71b475f1775d555cf5898921e86a1d/Screen_Shot_2016-01-07_at_3.17.32_PM.png) See merge request !2339
| * adds reference to the bottom of sidebarJacob Schatz2016-01-071-9/+10
| |
* | Use `xmlschema` where even more appropriate!Robert Speicher2016-01-078-9/+9
| |
* | Use `to_s(:iso8601)` where appropriateRobert Speicher2016-01-0710-11/+11
| |
* | Add two custom Date/Time conversion formatsRobert Speicher2016-01-076-9/+9
| |
* | Remove stamp gemRobert Speicher2016-01-077-10/+10
|/ | | | Closes #5908
* Fix typo in js method and some repeating cssDmitriy Zaporozhets2016-01-071-4/+4
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add support for ref and path to commits filteringDmitriy Zaporozhets2016-01-071-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add ajax filtering for commits listDmitriy Zaporozhets2016-01-071-6/+4
| | | | | | Also handle commits list with Pager class to prevent code duplication Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add search field to commits pageDmitriy Zaporozhets2016-01-071-6/+12
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-075-6/+61
|
* Merge branch 'remove-influxdb-credentials' into 'master' Yorick Peterse2016-01-071-8/+0
|\ | | | | See merge request !2319
| * Remove InfluxDB username/passwordremove-influxdb-credentialsYorick Peterse2016-01-061-8/+0
| | | | | | | | | | InfluxDB over UDP doesn't use authentication, thus there's no need for these settings.
* | Merge branch 'more-opengraph' into 'master' Robert Speicher2016-01-065-10/+17
|\ \ | | | | | | | | | | | | Add Open Graph data for group, project and commit. See merge request !2211
| * \ Merge branch 'master' into more-opengraphmore-opengraphDouwe Maan2016-01-062-1/+16
| |\ \ | | |/
| * | Don't override issue page description in project layout.Douwe Maan2016-01-063-2/+4
| | |
| * | Remove now-redundant `page_description` call from Groups#showRobert Speicher2016-01-051-2/+0
| | |
| * | Remove now-redundant `page_description` call from Projects#showRobert Speicher2016-01-051-3/+1
| | |
| * | Make `page_description` less magical :sparkles:Robert Speicher2016-01-052-6/+8
| | |
| * | Merge branch 'master' into more-opengraphDouwe Maan2016-01-0532-129/+193
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # app/views/layouts/_head.html.haml
| * | | Add Open Graph data for group, project and commit.Douwe Maan2015-12-254-6/+12
| | | |
* | | | Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-uncheckedDouwe Maan2016-01-062-1/+16
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix the abuse report detail URL in the HTML email templaters-fix-abuse-report-urlRobert Speicher2016-01-051-1/+1
| | | |
| * | | Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master' Douwe Maan2016-01-051-0/+15
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Add graphs of commits ahead/behind default branch (by @brunsa2) Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1716 See merge request !2301
| | * | Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-12-03135-754/+867
| | |\ \
| | * \ \ Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-11-1299-420/+956
| | |\ \ \
| | * | | | Refactor for style issuesJeff Stubler2015-11-111-5/+6
| | | | | |
| | * | | | Add graphs showing commits ahead and behind default to branches pageJeff Stubler2015-11-011-0/+14
| | | | | |
* | | | | | Get "Merge when build succeeds" to work when commits were pushed to MR ↵Douwe Maan2016-01-051-1/+1
|/ / / / / | | | | | | | | | | | | | | | target branch while builds were running
* | | | | Merge branch 'joshfng/gitlab-ce-fix-3802' into 'master' Douwe Maan2016-01-052-4/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show 'New Merge Request' buttons on canonical repo. (by @joshfng) Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2189 to run tests on our runners. See merge request !2300
| * | | | | Change text back. Add additional tests.joshfng/gitlab-ce-fix-3802Josh Frye2016-01-031-1/+1
| | | | | |
| * | | | | Fix testsJosh Frye2016-01-032-2/+2
| | | | | |
| * | | | | Show 'New Merge Request' buttons on canonical repo.Josh Frye2016-01-032-5/+7
| | | | | |
* | | | | | Merge branch 'improved-leave-project' into 'master' Dmitriy Zaporozhets2016-01-052-16/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds settings menu to the top for editting and leaving projects @creamzy @skyruler @dzaporozhets Menu contents depends on user's rights. Fixes #4221 ![Screen_Shot_2015-12-23_at_10.02.47_PM](/uploads/daeaef937bf9d9f4db7ccb674e344ac1/Screen_Shot_2015-12-23_at_10.02.47_PM.png) ![Screen_Shot_2015-12-23_at_10.02.41_PM](/uploads/58eb4eea7d640f01d7f05c2a408a2c04/Screen_Shot_2015-12-23_at_10.02.41_PM.png) ![Screen_Shot_2015-12-23_at_10.02.55_PM](/uploads/4b2ae027a13efcbad3eb81b04f134c4f/Screen_Shot_2015-12-23_at_10.02.55_PM.png) ![Screen_Shot_2015-12-23_at_10.04.47_PM](/uploads/bd5d9d8ddd72d16d74c32c6c1f569776/Screen_Shot_2015-12-23_at_10.04.47_PM.png) See merge request !2195
| * | | | | | removes footer message about access to projectJacob Schatz2016-01-041-8/+1
| | | | | | |
| * | | | | | Merge branch 'master' into improved-leave-projectJacob Schatz2015-12-281-0/+53
| |\ \ \ \ \ \
| * | | | | | | fixes tests failingJacob Schatz2015-12-281-2/+2
| | | | | | | |
| * | | | | | | adds settings menu to the top for editting and leaving projectsJacob Schatz2015-12-282-9/+18
| | | | | | | |
* | | | | | | | Merge branch 'rs-logo-animation' into 'master' Dmitriy Zaporozhets2016-01-051-7/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the logo as a loading indicator ![logo-sweep](/uploads/ff048fd2e56a6dcae8801f998b484623/logo-sweep.gif) See merge request !2277
| * | | | | | | | Correct the logo ID namesRobert Speicher2016-01-041-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Her left, not ours!
| * | | | | | | | Give the logo shapes meaningful IDsRobert Speicher2016-01-021-7/+7
| | | | | | | | |
* | | | | | | | | Redesign the AbuseReports indexrs-abuse-reportsRobert Speicher2016-01-042-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Shows when the reported user joined - Show relative timestamp for when the report was created - Parse message with restricted Markdown pipeline to autolink URLs
* | | | | | | | | Merge branch 'show-all-builds-by-default' into 'master' Robert Speicher2016-01-042-11/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show all builds by default in the builds page Fixes #4240 See merge request !2243
| * | | | | | | | | Show 'All' tab by default in the builds pageshow-all-builds-by-defaultDouglas Barbosa Alexandre2016-01-042-11/+11
| | | | | | | | | |
* | | | | | | | | | remove public field from namespace and refactoringnamespace-clean_upValery Sizov2016-01-042-11/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch 'rs-delimit-all-the-things' into 'master' Dmitriy Zaporozhets2016-01-0411-36/+36
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | number_with_delimiter most of the things See merge request !2258
| * | | | | | | | | number_with_delimiter most of the thingsrs-delimit-all-the-thingsRobert Speicher2015-12-3111-36/+36
| | | | | | | | | |
* | | | | | | | | | Merge branch 'rs-abuse-report-form' into 'master' Dmitriy Zaporozhets2016-01-041-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add js-requires-input and js-quick-submit to abuse report form See merge request !2245
| * | | | | | | | | | Add js-requires-input and js-quick-submit to abuse report formrs-abuse-report-formRobert Speicher2015-12-301-2/+2
| | | | | | | | | | |