Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | adds hover titles to merge request and issue pageshover-descriptions | Jacob Schatz | 2016-01-11 | 1 | -5/+9 |
| | |||||
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2016-01-11 | 1 | -5/+4 |
|\ | |||||
| * | Merge branch 'rs-zenmode-cleanup' into 'master' | Douwe Maan | 2016-01-11 | 1 | -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-cleanup | Robert Speicher | 2016-01-08 | 1 | -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-erb | Douwe Maan | 2016-01-11 | 3 | -22/+24 |
|\ \ \ | |/ / |/| | | use JavaScript instead of CoffeeScript in Views for master | ||||
| * | | use JavaScript instead of CoffeeScript in Views, the reason #9819 | Jason Lee | 2016-01-11 | 3 | -22/+24 |
| | | | |||||
* | | | Merge branch 'fix-build-status-caching' into 'master' | Dmitriy Zaporozhets | 2016-01-11 | 1 | -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 dashboard | Stan Hu | 2016-01-08 | 1 | -5/+8 |
| | |/ | |/| | | | | | | | Closes #3268 | ||||
* | | | Merge branch 'load-autocomplete-when-needed' into 'master' | Dmitriy Zaporozhets | 2016-01-11 | 1 | -3/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Only load autocomplete data when actually needed See merge request !2365 | ||||
| * | | | Only load autocomplete data when actually needed | Yorick Peterse | 2016-01-11 | 1 | -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ński | 2016-01-11 | 1 | -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 projects | Steffen Köhler | 2016-01-10 | 1 | -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 Zaporozhets | 2016-01-11 | 1 | -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-fix | Jacob Schatz | 2016-01-08 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'add-pencil-icon-to-group-page' into 'master' | Dmitriy Zaporozhets | 2016-01-11 | 1 | -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 user | Stan Hu | 2016-01-10 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Add pencil icon to edit group settings | Stan Hu | 2016-01-10 | 1 | -3/+5 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | Move icons to upper-right corner of group page Closes #6038 | ||||
* | | | | | Merge gitlab.com:gitlab-org/gitlab-ce | Jeroen Nijhof | 2016-01-11 | 4 | -6/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Issue #5817 wording of the web hooks updated on issue and merge events | iqualisoni | 2016-01-11 | 2 | -4/+4 |
| |/ / / / | |||||
| * | | | | Disable "Already Blocked" button in admin abuse report page | Stan Hu | 2016-01-09 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
| * | | | Merge branch 'cross-project-reference-typo-fix' into 'master' | Robert Speicher | 2016-01-08 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | changes verb `references` to noun `reference`. See merge request !2349 | ||||
| | * | | | changes verb `references` to noun `reference`.cross-project-reference-typo-fix | Jacob Schatz | 2016-01-08 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Remove Block Button from Abuse Reports page if User is Already Blocked | Robert Speicher | 2016-01-08 | 1 | -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-blocked | Kelvin | 2016-01-06 | 1 | -0/+3 |
| | | | | |||||
| | * | | Remove block button on abuse reports if user is already blocked | Kelvin | 2016-01-06 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge gitlab.com:gitlab-org/gitlab-ce | Jeroen Nijhof | 2016-01-08 | 19 | -41/+46 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'cross-project-reference-move' into 'master' | Dmitriy Zaporozhets | 2016-01-08 | 1 | -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 sidebar | Jacob Schatz | 2016-01-07 | 1 | -9/+10 |
| | | | | | |||||
| * | | | | Use `xmlschema` where even more appropriate! | Robert Speicher | 2016-01-07 | 8 | -9/+9 |
| | | | | | |||||
| * | | | | Use `to_s(:iso8601)` where appropriate | Robert Speicher | 2016-01-07 | 10 | -11/+11 |
| | | | | | |||||
| * | | | | Add two custom Date/Time conversion formats | Robert Speicher | 2016-01-07 | 6 | -9/+9 |
| | | | | | |||||
| * | | | | Remove stamp gem | Robert Speicher | 2016-01-07 | 7 | -10/+10 |
| |/ / / | | | | | | | | | | | | | Closes #5908 | ||||
| * | | | Fix typo in js method and some repeating css | Dmitriy Zaporozhets | 2016-01-07 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Add support for ref and path to commits filtering | Dmitriy Zaporozhets | 2016-01-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Add ajax filtering for commits list | Dmitriy Zaporozhets | 2016-01-07 | 1 | -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 page | Dmitriy Zaporozhets | 2016-01-07 | 1 | -6/+12 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Merge gitlab.com:gitlab-org/gitlab-ce | Jeroen Nijhof | 2016-01-07 | 12 | -25/+79 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Jacob Vosmaer | 2016-01-07 | 5 | -6/+61 |
| | | | | |||||
| * | | | Merge branch 'remove-influxdb-credentials' into 'master' | Yorick Peterse | 2016-01-07 | 1 | -8/+0 |
| |\ \ \ | | | | | | | | | | | See merge request !2319 | ||||
| | * | | | Remove InfluxDB username/passwordremove-influxdb-credentials | Yorick Peterse | 2016-01-06 | 1 | -8/+0 |
| | |/ / | | | | | | | | | | | | | | | | | InfluxDB over UDP doesn't use authentication, thus there's no need for these settings. | ||||
| * | | | Merge branch 'more-opengraph' into 'master' | Robert Speicher | 2016-01-06 | 5 | -10/+17 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Add Open Graph data for group, project and commit. See merge request !2211 | ||||
| | * \ \ | Merge branch 'master' into more-opengraphmore-opengraph | Douwe Maan | 2016-01-06 | 2 | -1/+16 |
| | |\ \ \ | | | |/ / | |||||
| | * | | | Don't override issue page description in project layout. | Douwe Maan | 2016-01-06 | 3 | -2/+4 |
| | | | | | |||||
| | * | | | Remove now-redundant `page_description` call from Groups#show | Robert Speicher | 2016-01-05 | 1 | -2/+0 |
| | | | | | |||||
| | * | | | Remove now-redundant `page_description` call from Projects#show | Robert Speicher | 2016-01-05 | 1 | -3/+1 |
| | | | | | |||||
| | * | | | Make `page_description` less magical :sparkles: | Robert Speicher | 2016-01-05 | 2 | -6/+8 |
| | | | | | |||||
| | * | | | Merge branch 'master' into more-opengraph | Douwe Maan | 2016-01-05 | 32 | -129/+193 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/layouts/_head.html.haml | ||||
| | * | | | | Add Open Graph data for group, project and commit. | Douwe Maan | 2015-12-25 | 4 | -6/+12 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-unchecked | Douwe Maan | 2016-01-06 | 2 | -1/+16 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | Get "Merge when build succeeds" to work when commits were pushed to MR ↵ | Douwe Maan | 2016-01-05 | 1 | -1/+1 |
| | |_|/ / | |/| | | | | | | | | | | | | | target branch while builds were running |