summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-112-84/+72
| | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-1/+1
| | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Revert "Merge branch 'improve-merge-requests' into 'master' "Dmitriy Zaporozhets2015-08-112-67/+83
| | | | | This reverts commit 4773f38e28c91dbbb6e5e385e0c403877298bfed, reversing changes made to 0d5d80b735eb18ae79eb2bfe26c08896d53db414.
* Revert "Merge branch 'mr-widget-text' into 'master' "Dmitriy Zaporozhets2015-08-111-4/+0
| | | | | This reverts commit 151d9fb35fd66a161cf0e1f95d7b0f0448ca8034, reversing changes made to 819d110cabfc2791e0e84bd89b9f87aef570c1db.
* Merge branch 'mr-widget-text' into 'master' 8-0-developmentDmitriy Zaporozhets2015-08-101-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve text of MR merge widget and manual merge modal Modal with manual merge instructions: ![Screen_Shot_2015-08-08_at_21.30.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2bffe42e9ad76afd02efbe5816027767/Screen_Shot_2015-08-08_at_21.30.23.png) Archived: ![archived](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e1efa1d54ce7ead8de6e88ca34095c09/archived.png) WIP: ![wip](https://gitlab.com/gitlab-org/gitlab-ce/uploads/14a831458d0946722559ec643f91678c/wip.png) Missing target branch: ![missing_branch](https://gitlab.com/gitlab-org/gitlab-ce/uploads/340083bbacbc234906e58cf76c586a9e/missing_branch.png) Missing source branch: ![missing_branch_source](https://gitlab.com/gitlab-org/gitlab-ce/uploads/72f80ed58efed88b2bbcf403b55b1a01/missing_branch_source.png) Nothing to merge: ![nothing](https://gitlab.com/gitlab-org/gitlab-ce/uploads/85b0d9da87acacd53cffd0df58d8eed4/nothing.png) Checking ability to merge: ![check](https://gitlab.com/gitlab-org/gitlab-ce/uploads/32d75322e622025610c446e8ca7d892d/check.png) Conflicts when allowed to merge: ![conflicts](https://gitlab.com/gitlab-org/gitlab-ce/uploads/23fdb2c60a27d873b3cc8a008203eb59/conflicts.png) Conflicts when not allowed to merge: ![conflicts_not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/113462a80fc65bf48b20dc0efd808363/conflicts_not_allowed.png) Mergeable when allowed to merge: ![accept](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1b3bb1a71df21728fe9318e7a083bfba/accept.png) Mergeable when not allowed to merge: ![not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d38fa5c96f8f9d7223bb6bc7ad36f29d/not_allowed.png) Merge in progress: ![locked](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b60dcf5eb70e6032b0e8aac766018df3/locked.png) Merge failed: ![failed_2](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3713b9a10298183935b028b658271ac9/failed_2.png) Merged: ![merged](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7f68a48dd197a71351c9a80c59c8ecbe/merged.png) Closed: ![closed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d5ce040449b7db943bd2fbfffb607a10/closed.png) cc @dzaporozhets @rspeicher See merge request !1120
| * Merge branch 'master' into mr-widget-textDouwe Maan2015-08-093-3/+10
| |\
| * | Make modal narrowerDouwe Maan2015-08-091-0/+4
| | |
* | | Merge branch 'dropzone-upload-progress' into 'master'Stan Hu2015-08-102-1/+17
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dropzone upload progress This MR adds upload progress in percents to dropzone. ![progress](https://gitlab.com/vernik91/gitlab-ce/uploads/9be251e4f3a99bc1d65435b1f001d021/progress.png) I thought, it can be nice small enhancement :) See merge request !1125
| * | Add dropzone upload progressNikita Verkhovin2015-08-102-1/+17
| | |
* | | Merge branch 'ui-improvements' into 'master' Dmitriy Zaporozhets2015-08-092-3/+10
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Ui improvements * revert of wrong patch * spall margin change Explanation with screenshots here - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/579#note_1845510 See merge request !1117
| * | Revert "Put author name at the end of a tree row"Dmitriy Zaporozhets2015-08-071-1/+5
| | | | | | | | | | | | This reverts commit ee0fc2c3ad9608db91175e082fe1f6da19a3aec7.
| * | Add more spacing between MR widget and tabsDmitriy Zaporozhets2015-08-071-2/+5
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix transparency for msapplication-tile imageRobert Speicher2015-08-081-0/+0
|/ | | | [ci skip]
* Move command line insturction out of mr widgetDmitriy Zaporozhets2015-08-071-15/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor merge request widgetDmitriy Zaporozhets2015-08-072-68/+65
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add project name to project headDouwe Maan2015-08-062-1/+11
|
* Merge branch 'tree-author-at-end' into 'master'Dmitriy Zaporozhets2015-08-061-5/+1
|\ | | | | | | | | | | | | | | Put author name at the end of a tree row Put author name at the end of a tree row as the commit message is more important than the author name. See merge request !579
| * Put author name at the end of a tree rowSven Strickroth2015-08-051-5/+1
| | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-051-1/+1
|\ \
| * \ Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-0420-21/+54
| |\ \ | | |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-161-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'ci-skipped-status' into 'master' Kamil Trzciński2015-08-052-1/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for CI skipped status This is required to support: https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/216 See merge request !1073
| * | | Added support for CI skipped statusci-skipped-statusKamil Trzcinski2015-08-042-1/+6
| | |/ | |/|
* | | Merge remote-tracking branch 'public/project-buttons'Dmitriy Zaporozhets2015-08-052-7/+11
|\ \ \ | |/ / |/| |
| * | Don't hide the clone holder for an empty projectproject-buttonsRobert Speicher2015-08-041-3/+3
| | |
| * | Tweak project page buttons.Douwe Maan2015-07-312-7/+11
| | |
* | | Merge branch 'add-license'Dmitriy Zaporozhets2015-08-031-0/+9
|\ \ \
| * | | Show buttons to add license, changelog and contribution guide if they're ↵Douwe Maan2015-07-301-0/+9
| |/ / | | | | | | | | | missing.
* | | Make `code` elements in links display as suchrs-code-linksRobert Speicher2015-07-312-1/+5
|/ / | | | | | | Also adds some minor padding to inline `code` elements.
* | Make `hr`s more visible in note bodiesrs-issue-2107Robert Speicher2015-07-271-1/+3
| | | | | | | | Closes #2107
* | Fix live notes refresh in relative URL deploymentsStan Hu2015-07-261-1/+0
| |
* | Merge branch 'fix-reload-with-full-diff-url' into 'master'Stan Hu2015-07-251-8/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the "Reload with full diff" URL button On the first load, the merge request tabs would be requested in JSON format to render the HTML. This would cause the "Reload with full diff" button to create a link to `diff.json`. Instead, generate the path in HTML mode. Closes #2041 See merge request !1019
| * | Fix the "Reload with full diff" URL buttonStan Hu2015-07-231-8/+2
| | | | | | | | | | | | | | | | | | | | | On the first load, the merge request tabs would be requested in JSON format to render the HTML. This would cause the "Reload with full diff" button to create a link to diff.json. Closes #2041
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2015-07-241-0/+4
|\ \ \
| * | | Gitlab Issue 707: Indent unfolded code 1 characterngentile2015-07-221-0/+4
| |/ /
* | | Merge branch 'auth-icons-labels' into 'master' Valery Sizov2015-07-247-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow custom label to be set for authentication providers. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2341 Beside the above, I've: - Refactored `OauthHelper` to have clearer method names and behaviour - Moved some of `OauthHelper` behaviour to `Gitlab::OAuth::Provider` - Renamed `OauthHelper` to `AuthHelper` since LDAP, SAML, Kerberos aren't OAuth - Updated the icons for GitHub and GitLab In the examples below, "OurAuth" is a SAML provider with a custom label. ![Screen_Shot_2015-07-02_at_16.29.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7d425bde69dc34e1667ebd5375d0266d/Screen_Shot_2015-07-02_at_16.29.52.png) ![Screen_Shot_2015-07-02_at_16.31.40](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cbb273321ecdf4cab3d3ef0dc35553e7/Screen_Shot_2015-07-02_at_16.31.40.png) ![Screen_Shot_2015-07-02_at_16.32.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d8dd6e1d0dc45a788e869cdcdc99e178/Screen_Shot_2015-07-02_at_16.32.39.png) ![Screen_Shot_2015-07-02_at_16.33.18](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7dbfe8b0ae229c32a08d6c7442976d83/Screen_Shot_2015-07-02_at_16.33.18.png) See merge request !927
| * | | Allow custom label to be set for authentication providers.auth-icons-labelsDouwe Maan2015-07-237-0/+0
| |/ /
* | | Fix and style the "Changes suppressed" link.rs-changes-suppressed-linkRobert Speicher2015-07-233-4/+16
|/ /
* | Fix full screen mode for snippet commentsDaniel Gerhardt2015-07-211-1/+4
| | | | | | | | | | | | ZenMode is now initialized for snippet pages. Fixes #2036.
* | Show the first tab automatically on MergeRequests#newrs-issue-2013Robert Speicher2015-07-181-3/+9
| | | | | | | | Closes #2013
* | Merge branch 'fix-note-edit-upload-link' into 'master'Stan Hu2015-07-181-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix file upload dialog for comment editing This fixes the file upload dialog which currently works for new comments but not for comment editing. The cause for this is a missing DOM class which causes traversal to the dropzone to fail. This is fixed by adding the expected `gfm-form` class to the edit form. It has to be added dynamically since adding it to the form template would break the form's layout and comment saving. The following screenshot illustrates the issue: ![gitlab-dropzone-upload-dialog-bug](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3a9885c8ba7c07338148ec9e605e5771/gitlab-dropzone-upload-dialog-bug.png) See merge request !956
| * | Fix file upload dialog for comment editingDaniel Gerhardt2015-07-171-1/+1
| |/ | | | | | | | | | | | | | | | | | | This fixes the file upload dialog which currently works for new comments but not for comment editing. The cause for this is a missing DOM class which causes traversal to the dropzone to fail. This is fixed by adding the expected `gfm-form` class to the edit form. It has to be added dynamically since adding it to the form template would break the form's layout and comment saving.
* | Fix bug where clicking on the link icon on a file would result in ↵Stan Hu2015-07-171-1/+1
|/ | | | | | "L#undefined" in the URL Closes #2002
* Merge branch 'nice-scroll-sidebar' into 'master'Dmitriy Zaporozhets2015-07-142-1/+3
|\ | | | | | | | | | | | | | | Add nice scroll for sidebar Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !978
| * Add nice scroll for sidebarDmitriy Zaporozhets2015-07-142-1/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Hide scrollbar from sidebar when external mouse is connected to OSXKamil Trzcinski2015-07-141-1/+2
|/
* Merge branch 'project-default-view' into 'master'Dmitriy Zaporozhets2015-07-142-2/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow user to specify content he wants to see on project page Improvement to !938. Since a lot of people complain on fact they don't like to see README. Especially since we already have a switcher for dashboard - it kind of acceptable to select behaviour. User can specify which content he/she wants to see: ![Screenshot_2015-07-13_18.24.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d237474e8f52df4a62ba7e951fa28bd8/Screenshot_2015-07-13_18.24.31.png) ![Screenshot_2015-07-13_18.24.36](https://gitlab.com/gitlab-org/gitlab-ce/uploads/473b0e2a94b3de16d048b8332b539816/Screenshot_2015-07-13_18.24.36.png) cc @JobV @jacobvosmaer @marin @sytses See merge request !970
| * Allow user to specify content he wants to see on project pageproject-default-viewDmitriy Zaporozhets2015-07-132-2/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Increase padding between menu items a bitDmitriy Zaporozhets2015-07-131-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Make sidebar scrollable. It prevents content overflow for small screensDmitriy Zaporozhets2015-07-132-8/+6
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status