summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Ensure "Remove Source Branch" button is not shown when branch is being ↵issue_3583Rubén Dávila2015-12-047-6/+62
| | | | deleted. #3583
* Merge branch 'ui/sidebar' into 'master' Dmitriy Zaporozhets2015-12-0417-194/+223
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Sidebar & header tweaks and fixes Depends on !1953 See the commits for more details, the messages mostly speak for themselves. ![Logo](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ba088150165bb0a0aea1e894f3443f43/logo_tooltip.png) ![Sidebar](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c1e8c09ac3bf489cdb9531eebea18c90/sidebar_tooltips.png) Fixes #2928, #2071, https://dev.gitlab.org/gitlab/gitlabhq/issues/2575, and https://dev.gitlab.org/gitlab/gitlabhq/issues/2573 See merge request !1958
| * Merge branch 'master' into ui/sidebarui/sidebarDouwe Maan2015-12-0388-348/+378
| |\ | | | | | | | | | | | | # Conflicts: # app/assets/stylesheets/framework/sidebar.scss
| * | Revert unrelated changesDouwe Maan2015-12-021-0/+3
| | |
| * | Page titles are title case.Douwe Maan2015-12-021-2/+2
| | |
| * | Fade in/out Back icon when sidebar is toggledDouwe Maan2015-12-021-1/+5
| | |
| * | Fix header tooltip alignmentDouwe Maan2015-12-021-6/+6
| | |
| * | Fix logo height in signed-out header barDouwe Maan2015-12-021-3/+5
| | |
| * | Restore sidebar tooltips and fix logo tooltip locationDouwe Maan2015-12-0214-185/+207
| | |
* | | Merge branch 'ui/form-consistency' into 'master' Dmitriy Zaporozhets2015-12-0456-213/+201
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Improve form consistency Depends on !1953 See the commits for more details, the messages mostly speak for themselves. # Highlights ## Tag form Before: ![tag_before](/uploads/ee5ba6ef405749013f9e5717ebcf72f3/tag_before.png) After: ![tag_after](/uploads/71bb543553190d91c03fd706cce35923/tag_after.png) See merge request !1955
| * | | Fix specui/form-consistencyDouwe Maan2015-12-031-4/+4
| | | |
| * | | Fix specsDouwe Maan2015-12-032-5/+5
| | | |
| * | | Merge branch 'master' into ui/form-consistencyDouwe Maan2015-12-0388-348/+380
| |\ \ \ | | | |/ | | |/|
| * | | Tweak tag form wordingDouwe Maan2015-12-031-1/+1
| | | |
| * | | Rename variableDouwe Maan2015-12-022-4/+4
| | | |
| * | | Add `http://gitlab.example.com/u/` prefix to "Change username" field.Douwe Maan2015-12-021-3/+4
| | | |
| * | | Remove `.git` suffix to project path field.Douwe Maan2015-12-021-1/+0
| | | |
| * | | Use select2 instead of regular selectbox for profile public emailDouwe Maan2015-12-021-1/+1
| | | |
| * | | Use autofocus where appropriateDouwe Maan2015-12-023-3/+3
| | | |
| * | | Use js-requires-input where appropriateDouwe Maan2015-12-026-14/+10
| | | |
| * | | Use select2 placeholder instead of blank optionDouwe Maan2015-12-021-2/+1
| | | |
| * | | Remove unnecesary wrapper elementsDouwe Maan2015-12-027-26/+15
| | | |
| * | | Only use input placeholders when they add valueDouwe Maan2015-12-026-11/+13
| | | |
| * | | Don't write "Optional" or "Required" unless non-obviousDouwe Maan2015-12-024-6/+3
| | | |
| * | | Use form-actions where appropriateDouwe Maan2015-12-026-18/+23
| | | |
| * | | Add cancel button to forms that didn't have one alreadyDouwe Maan2015-12-0212-22/+28
| | | |
| * | | Add cancel button to forms that didn't have one alreadyDouwe Maan2015-12-024-5/+6
| | | |
| * | | Use consistent casing for form field labelsDouwe Maan2015-12-0210-30/+19
| | | |
| * | | Use consistent casing for page titlesDouwe Maan2015-12-0229-58/+62
| | |/ | |/|
* | | Merge branch 'ui/login-page' into 'master' Dmitriy Zaporozhets2015-12-044-7/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix background and padding of login and error pages Was gray, is white again. See merge request !1978
| * | | Fix background and padding of login and error pagesui/login-pageDouwe Maan2015-12-034-7/+10
| | |/ | |/|
* | | Merge branch 'doc-ssh' into 'master' Achilleas Pipinellis2015-12-041-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Correction of markdown in SSH docs Correction of broken markdown in SSH docs See merge request !1900
| * | | Correction of markdown in SSH docsLaurens Stötzel2015-11-251-2/+3
| | | |
* | | | Merge branch 'fork-event' into 'master' Robert Speicher2015-12-032-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Don't show project fork event as imported See merge request !1949
| * \ \ \ Merge branch 'master' into fork-eventfork-eventDouwe Maan2015-12-0388-348/+380
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Don't show project fork event as importedDouwe Maan2015-12-022-1/+2
| | |_|/ | |/| |
* | | | Merge branch 'new-tag-branch-authorization' into 'master' Robert Speicher2015-12-032-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add authorization to new branch/tag pages. The create actions have authorization, the new actions didn't, so no-one unauthorized could actually do anything, but it was wrong(TM). See merge request !1979
| * | | | Add authorization to new branch/tag pages.new-tag-branch-authorizationDouwe Maan2015-12-032-2/+2
| | |/ / | |/| |
* | | | Merge branch 'fix-ruby-version' into 'master' Robert Speicher2015-12-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update .ruby-version to 2.1.7 Fixes #3835 See merge request !1980
| * | | | Update .ruby-version to 2.1.7fix-ruby-versionRobert Schilling2015-12-031-1/+1
| | | | |
* | | | | Merge branch 'ci_docker_docs' into 'master' Kamil Trzciński2015-12-031-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | fixes #3263 slashes are replaced with two underscores See merge request !1981
| * | | | fixes #3263 slashes are replaced with two underscoresKevin Pankonen2015-12-031-2/+2
|/ / / /
* | | | Merge branch 'issue_3468_broken_link' into 'master' Drew Blessing2015-12-036-5/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed invalid link on starred projects dashboard. Fixes #3468 The MR fixes 'Project' links on a dashboard pages headers. See the issue for the details. This MR does not include tests since the change is rather trivial and there are no (as far as I have seen) existing tests for checking links validity. In case tests are required I would like to get some guidance on the implementation first. At least I would like to know what should be covered: changed links, all header links, all navigation? See merge request !1926
| * | | | Fixed invalid link on starred projects dashboard.Anton Baklanov2015-12-036-5/+6
| | | | | | | | | | | | | | | | | | | | Fixes #3468
* | | | | Merge branch 'ui/wiki' into 'master' Dmitriy Zaporozhets2015-12-0311-61/+65
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Use new style for wiki Depends on !1953 See the commits for more details, the messages mostly speak for themselves. # Highlights ## Wiki Page Before: ![Screen_Shot_2015-12-02_at_17.48.45](/uploads/aa53f768b8760f2e15d765e06d5ff773/Screen_Shot_2015-12-02_at_17.48.45.png) After: ![Screen_Shot_2015-12-02_at_17.48.16](/uploads/f8a376651aff9c8de82621578aaeb002/Screen_Shot_2015-12-02_at_17.48.16.png) ## Edit Wiki Page Before: ![Screen_Shot_2015-12-02_at_17.48.59](/uploads/c9ffddaca3156046b99cba11bdb0ea4f/Screen_Shot_2015-12-02_at_17.48.59.png) After: ![Screen_Shot_2015-12-02_at_17.48.26](/uploads/1aa62049f120c91436ed68fd7441c156/Screen_Shot_2015-12-02_at_17.48.26.png) See merge request !1967
| * | | | | Fix specsui/wikiDouwe Maan2015-12-032-3/+3
| | | | | |
| * | | | | Merge branch 'master' into ui/wikiDouwe Maan2015-12-0388-348/+380
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Use new style for wikiDouwe Maan2015-12-0211-58/+62
| | |_|/ / | |/| | |
* | | | | Merge branch 'ui/new-project' into 'master' Dmitriy Zaporozhets2015-12-033-21/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: New Project form tweaks Depends on !1953 See the commits for more details, the messages mostly speak for themselves. Before: ![Screen_Shot_2015-12-02_at_17.43.23](/uploads/302e734f6796a85a9f4be9c2f494869d/Screen_Shot_2015-12-02_at_17.43.23.png) After: ![Screen_Shot_2015-12-02_at_17.44.11](/uploads/411980e53a4f87cf0a04e5bcb7329f82/Screen_Shot_2015-12-02_at_17.44.11.png) See merge request !1964
| * \ \ \ \ Merge branch 'master' into ui/new-projectui/new-projectDouwe Maan2015-12-0388-348/+380
| |\ \ \ \ \ | | | |/ / / | | |/| | |
View Lorry Controller Status