summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* adds hover titles to merge request and issue pageshover-descriptionsJacob Schatz2016-01-111-5/+9
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-01-111-5/+4
|\
| * Merge branch 'rs-zenmode-cleanup' into 'master' Douwe Maan2016-01-111-5/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor ZenMode - No longer depends on the "hidden checkbox". - No longer depends on manually storing/restoring the scroll position. Instead, we take advantage of jquery.scrollTo. - Event-based. - Simplifies the state-based styling. See merge request !2354
| | * Refactor ZenModers-zenmode-cleanupRobert Speicher2016-01-081-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | - No longer depends on the "hidden checkbox". - No longer depends on manually storing/restoring the scroll position. Instead, we take advantage of jquery.scrollTo. - Event-based. - Simplifies the state-based styling.
* | | Merge pull request #9960 from huacnlee/fix/do-not-use-coffeescript-in-erbDouwe Maan2016-01-113-22/+24
|\ \ \ | |/ / |/| | use JavaScript instead of CoffeeScript in Views for master
| * | use JavaScript instead of CoffeeScript in Views, the reason #9819Jason Lee2016-01-113-22/+24
| | |
* | | Merge branch 'fix-build-status-caching' into 'master' Dmitriy Zaporozhets2016-01-111-5/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix caching issue where build status was not updating in project dashboard The project dashboard page would show a stale build status since the caching key did not depend on it. Fix by adding the commit status if CI is applicable. Closes #3268 See merge request !2353
| * | | Fix caching issue where build status was not updating in project dashboardStan Hu2016-01-081-5/+8
| | |/ | |/| | | | | | | Closes #3268
* | | Merge branch 'load-autocomplete-when-needed' into 'master' Dmitriy Zaporozhets2016-01-111-3/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Only load autocomplete data when actually needed See merge request !2365
| * | | Only load autocomplete data when actually neededYorick Peterse2016-01-111-3/+5
| | | | | | | | | | | | | | | | | | | | Previously this would result in autocomplete data being loaded for every page (e.g. the page showing all Git branches of a project).
* | | | Merge branch 'fix-build-page-typo' into 'master' Kamil Trzciński2016-01-111-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix typo in build page of projects The column containing links to the builds is named Runner but actually contains the Build. See merge request !2347
| * | | Fix typo in build page of projectsSteffen Köhler2016-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The column containing links to the builds is named Runner but actually contains the Build ID. [ci skip]
* | | | Merge branch 'new-branch-position-fix' into 'master' Dmitriy Zaporozhets2016-01-111-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes new branch button positioning, when visible and not visible container Fixes #5893 #5893 was not completely fixed. If a new branch was pushed the container is in correct position but if no container existed the position was incorrect. This MR fixes that. See merge request !2348
| * | | | fixes new branch button positioning, when visible and not visible containernew-branch-position-fixJacob Schatz2016-01-081-1/+1
| | | | |
* | | | | Merge branch 'add-pencil-icon-to-group-page' into 'master' Dmitriy Zaporozhets2016-01-111-3/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pencil icon to edit group settings Move icons to upper-right corner of group page Before: ![image](/uploads/6694c33eae6e10a4e21efef465a07114/image.png) After: ![image](/uploads/0c17c2cf89fc0fde4344911b30f2635c/image.png) Closes #6038 See merge request !2361
| * | | | | Check for current userStan Hu2016-01-101-1/+2
| | | | | |
| * | | | | Add pencil icon to edit group settingsStan Hu2016-01-101-3/+5
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Move icons to upper-right corner of group page Closes #6038
* | | | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-114-6/+9
|\ \ \ \ \
| * | | | | Issue #5817 wording of the web hooks updated on issue and merge eventsiqualisoni2016-01-112-4/+4
| |/ / / /
| * | | | Disable "Already Blocked" button in admin abuse report pageStan Hu2016-01-091-1/+1
| | |_|/ | |/| |
| * | | Merge branch 'cross-project-reference-typo-fix' into 'master' Robert Speicher2016-01-081-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | changes verb `references` to noun `reference`. See merge request !2349
| | * | | changes verb `references` to noun `reference`.cross-project-reference-typo-fixJacob Schatz2016-01-081-1/+1
| | |/ /
| * | | Remove Block Button from Abuse Reports page if User is Already Blocked Robert Speicher2016-01-081-1/+4
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | An addition to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2292 Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/4667 See merge request !2313
| | * | Show that user is already blocked on Abuse Reportsfix-block-button-still-showing-on-abuse-reports-after-user-is-blockedKelvin2016-01-061-0/+3
| | | |
| | * | Remove block button on abuse reports if user is already blockedKelvin2016-01-061-1/+1
| | | |
* | | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-0819-41/+46
|\ \ \ \ | |/ / /
| * | | 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 gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-0712-25/+79
|\ \ \ \ | |/ / /
| * | | 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
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | 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
View Lorry Controller Status