summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Migrate from Sidetiq to Sidekiq-cronfeature/sidekiq-cronGabriel Mazetto2015-12-046-21/+49
| | | | Updated Sidekiq to 3.5.x
* 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
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Move "Add Group" button higher up in new project formDouwe Maan2015-12-021-8/+5
| | | | |
| * | | | Unify new project namespace select and path inputDouwe Maan2015-12-023-13/+21
| | |/ / | |/| |
* | | | Merge branch 'ui/issuable-filter' into 'master' Dmitriy Zaporozhets2015-12-039-30/+51
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Issuable filter tweaks Depends on !1953 See the commits for more details, the messages mostly speak for themselves. # Highlights ## Filter bar Before: ![filter_before](/uploads/b061be7521c6d5babb77c7d12e77f65e/filter_before.png) After: ![filter_after](/uploads/aadfbcd77caf1b49fde8ca6d781f1004/filter_after.png) ## Bulk edit bar Before: ![bulk_before](/uploads/849c98224e1f335c65c0de5616bbcdae/bulk_before.png) After: ![bulk_after](/uploads/185d29116663f9f663acab76d328096f/bulk_after.png) See merge request !1963
| * | | | Fix specui/issuable-filterDouwe Maan2015-12-031-1/+1
| | | | |
| * | | | Merge branch 'master' into ui/issuable-filterDouwe Maan2015-12-0388-348/+380
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Use placeholders rather than blank options in bulk issue edit selects.Douwe Maan2015-12-021-4/+8
| | | | |
| * | | | Make style of select2 box more consistent with controlsDouwe Maan2015-12-021-0/+11
| | | | |
| * | | | Remove "none" username for "Unassigned" and "Any User" select optionsDouwe Maan2015-12-025-20/+26
| | | | |
| * | | | Use "Any Label" and "Any Milestone" in selects rather than the ambiguous ↵Douwe Maan2015-12-022-4/+4
| | | | | | | | | | | | | | | | | | | | "Any" option
| * | | | Use select2 for bulk issue edit statusDouwe Maan2015-12-021-1/+1
| | |/ / | |/| |
* | | | Merge branch 'bugfix/star_cache' into 'master' Dmitriy Zaporozhets2015-12-031-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Touch project when toggling stars to update cache This is a fix for gitlab-org/gitlab-ce#3513. When a star toggle event happens, we touch project to clear cache key. This will trigger a new "updated_at" at the project model. If it's undesirable, please let me know and I will try to solve it in a different way. See merge request !1970
| * | | Touch project when toggling stars to update cacheGabriel Mazetto2015-12-031-1/+1
|/ / /
* | | Merge branch 'ui/issuable-list-item' into 'master' Dmitriy Zaporozhets2015-12-034-35/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Issuable list item tweaks Depends on !1953 See the commits for more details, the messages mostly speak for themselves. Before: ![Screen_Shot_2015-12-02_at_17.37.40](/uploads/00ac22d131c49ce548bccd96866cbc75/Screen_Shot_2015-12-02_at_17.37.40.png) After: ![merge_item_after](/uploads/201d742494596c50bbdb3626f06f65a8/merge_item_after.png) Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2590 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2589 See merge request !1962
| * \ \ Merge branch 'master' into ui/issuable-list-itemui/issuable-list-itemDouwe Maan2015-12-0388-348/+380
| |\ \ \ | | | |/ | | |/|
| * | | Tweak merge request list itemDouwe Maan2015-12-021-6/+6
| | | |
| * | | Link MR list item branch name to branchDouwe Maan2015-12-022-6/+2
| | | |
| * | | Move labels to second line of issue/MR list itemDouwe Maan2015-12-022-8/+12
| | | |
| * | | Link milestone item to issues with that milestoneDouwe Maan2015-12-022-6/+10
| | | |
| * | | Link issue/MR list item comments counter to commentsDouwe Maan2015-12-022-8/+8
| | | |
| * | | Use "Assigned to USER" tooltip in issue list itemDouwe Maan2015-12-023-4/+5
| | |/ | |/|
* | | Merge branch 'ui/milestones' into 'master' Dmitriy Zaporozhets2015-12-035-91/+149
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Use new style for milestone detail page Depends on !1953 See the commits for more details, the messages mostly speak for themselves. Before: ![Screen_Shot_2015-12-02_at_17.47.03](/uploads/62441f50963e0c5d6d04b065573c05f0/Screen_Shot_2015-12-02_at_17.47.03.png) After: ![Screen_Shot_2015-12-02_at_17.47.22](/uploads/ab29ac0c1819415cc647be173f8c92bd/Screen_Shot_2015-12-02_at_17.47.22.png) See merge request !1966
| * \ \ Merge branch 'master' into ui/milestonesui/milestonesDouwe Maan2015-12-0387-347/+379
| |\ \ \ | | | |/ | | |/|
| * | | Use new style for milestone detail pageDouwe Maan2015-12-023-86/+140
| | | |
| * | | Add "New X" link to dashboard/group milestone project-specific issue/MR panelsDouwe Maan2015-12-022-5/+9
| | |/ | |/|
* | | Merge branch 'ui/project-home-panel' into 'master' Dmitriy Zaporozhets2015-12-036-49/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Project home panel tweaks Depends on !1953 See the commits for more details, the messages mostly speak for themselves. Before: ![Screen_Shot_2015-12-02_at_17.46.01](/uploads/f07a4f2370c6863a68df46f655b513c4/Screen_Shot_2015-12-02_at_17.46.01.png) After: ![Screen_Shot_2015-12-02_at_17.45.40](/uploads/da9b19d3bd89b9421457e0df550efd6e/Screen_Shot_2015-12-02_at_17.45.40.png) See merge request !1965
| * \ \ Merge branch 'master' into ui/project-home-panelui/project-home-panelDouwe Maan2015-12-0388-341/+380
| |\ \ \ | | | |/ | | |/|
| * | | Remove duplicate styles.Douwe Maan2015-12-021-7/+0
| | | |
| * | | Use default cursor for project visibility label.Douwe Maan2015-12-021-1/+1
| | | |
| * | | Add visibility description tooltip to snippet and project visibility labelsDouwe Maan2015-12-024-47/+27
| | | |
| * | | Add edit and RSS buttons to project home panelDouwe Maan2015-12-021-0/+9
| | | |
| * | | Move project visibility status to the leftDouwe Maan2015-12-022-1/+6
| | |/ | |/|
* | | Merge branch 'procfile' into 'master' Valery Sizov2015-12-031-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | The Procfile is for development only See merge request !1950
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into procfileJacob Vosmaer2015-12-0389-349/+382
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'ui/emoji' into 'master' Dmitriy Zaporozhets2015-12-032-1/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Award emoji tweaks Before: ![emoji_before](/uploads/82786924d3cea0313321b9dde0356cd2/emoji_before.png) After: ![emoji_after](/uploads/07e94401701d7a622c3ed5cbaa148244/emoji_after.png) See merge request !1960
| * | | Merge branch 'master' into ui/emojiui/emojiDouwe Maan2015-12-0388-348/+380
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'fix_master' into 'master' Valery Sizov2015-12-032-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix failures in master See merge request !1974
| * | | | Fix failures in masterValery Sizov2015-12-032-2/+2
| | | | |
* | | | | Merge branch 'deprecated_warnings' into 'master' Dmitriy Zaporozhets2015-12-038-29/+21
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git rid of deprecated warnings after rails update https://gitlab.com/gitlab-org/gitlab-ce/issues/3798 https://gitlab.com/gitlab-org/gitlab-ce/issues/3797 See merge request !1946
| * | | | Rails deprecation warning about log_levelValery Sizov2015-12-031-1/+1
| | | | |
View Lorry Controller Status