summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'backport-ee-premailer' into 'master' Rémy Coutable2016-03-218-46/+75
|\ | | | | | | | | | | | | Backport premailer and diff changes from EE Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 See merge request !3318
| * Move diff line to separate partialbackport-ee-premailerDouwe Maan2016-03-192-19/+28
| |
| * Inline mailer CSS using premailer.Douwe Maan2016-03-196-27/+47
| | | | | | | | | | # Conflicts: # Gemfile.lock
* | Merge branch 'upgrade-rubocop' into 'master' Robert Speicher2016-03-213-481/+499
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Rubocop from 0.35.1 to 0.38.0 See [Rubocop's Releases page](https://github.com/bbatsov/rubocop/releases) for more info on what changed. Descriptions/StyleGuides removed as discussed in #14233. Changes: - Enable DisplayCopNames for lint output. - Default behavior for `Alias` changed, set to enforce `prefer_alias_method`. - Enabling Rails cops changed to new syntax. - Remove StyleGuides and move Descriptions to comments. - Add missing cops. - Add TODOs for cops that should be enabled in the future. - Set TargetRubyVersion to 2.1. See merge request !3197
| * | Update Rubocop from 0.35.1 to 0.38.0.connorshea2016-03-203-481/+499
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discussed in #14233. See [their releases](https://github.com/bbatsov/rubocop/releases) for more info. Changes: - Enable DisplayCopNames for lint output. - Default behavior for `Alias` changed, set to enforce `prefer_alias_method`. - Enabling Rails cops changed to new syntax. - Remove StyleGuides and move Descriptions to comments. - Add missing cops. - Add TODOs for cops that should be enabled in the future. - Set TargetRubyVersion to 2.1.
* | Merge branch 'css-zero-unit-again' into 'master' Jacob Schatz2016-03-203-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix a few remaining uses of `0px`. See #14299 for more information. cc: @jschatz1 See merge request !3310
| * | Fix a few remaining uses of `0px`.connorshea2016-03-183-3/+3
| | | | | | | | | | | | | | | | | | See #14299 for more information. [ci skip]
* | | Merge branch 'fix-default-http-clone' into 'master' Jacob Schatz2016-03-207-22/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make HTTP(s) label consistent on clone bar Sites that use http:// for the external_url should always display HTTP on the clone bar. Similarly, sites that use https:// should show HTTPS. Currently, the inconsistency looks like: ![http-magic](/uploads/945fda580f7ba5aee36cc572b49baf2b/http-magic.gif) Also restores the tooltips that vanished in 7ba4482fcf6: ![image](/uploads/b5a7b3e68b4992a447fcaa51915e866c/image.png) See merge request !3319
| * | | Move tooltip to the right of the dropdownStan Hu2016-03-201-0/+4
| | | |
| * | | Fix specs and remove unnecessary console.logStan Hu2016-03-202-3/+2
| | | |
| * | | Use http_clone_button and ssh_clone_button to restore tooltip functionality ↵Stan Hu2016-03-192-20/+12
| | | | | | | | | | | | | | | | in clone panel
| * | | Make HTTP(s) label consistent on clone barStan Hu2016-03-194-2/+22
| | | | | | | | | | | | | | | | | | | | Sites that use http:// for the external_url should always display HTTP on the clone bar. Similarly, sites that use https:// should show HTTPS.
* | | | Merge branch 'edit-form-alignment' into 'master' Jacob Schatz2016-03-204-8/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spacing below edit note form Also changed to allow the CSS to decide what should be hidden when editing Thanks @JobV for having eagle eyes :stuck_out_tongue_winking_eye: See merge request !3306
| * | | | Fix spacing below edit note formedit-form-alignmentPhil Hughes2016-03-184-8/+16
| | | | | | | | | | | | | | | | | | | | Also changed to allow the CSS to decide what should be hidden when editting
* | | | | Merge branch 'rs-auto-expand-sidebar' into 'master' Jacob Schatz2016-03-201-3/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand the issuable sidebar when coming back from the Changes tab Unless the user explicitly requested the collapsed sidebar. Fixes: #14353 See merge request !3256
| * | | | | Expand the issuable sidebar when coming back from the Changes tabrs-auto-expand-sidebarRobert Speicher2016-03-171-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | Unless the user explicitly requested the collapsed sidebar.
* | | | | | Merge branch 'dropdown-persits-filtered-data' into 'master' Jacob Schatz2016-03-201-1/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with filtered data persisting when dropdown closed ![labels](/uploads/4b9c902add76263d8488cc34ef49f142/labels.gif) Closes #14401 See merge request !3302
| * | | | | Fixed issue with filtered data persisting when dropdown closeddropdown-persits-filtered-dataPhil Hughes2016-03-181-1/+5
| | |/ / / | |/| | | | | | | | | | | | | Closes #14401
* | | | | Merge branch 'fix-image-diff' into 'master' Douwe Maan2016-03-194-4/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where wrong commit ID was being used in a merge request diff to show old image Closes #3769 Closes #14327 See merge request !3300
| * | | | | Fix bug where wrong commit ID was being used in a merge request diff to show ↵Stan Hu2016-03-194-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old image Closes #3769 Closes #14327
* | | | | | Merge branch 'remove-wip' into 'master' Jacob Schatz2016-03-1910-29/+118
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Easily (un)mark merge request as WIP using link Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3768 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3516 ## Link to add `WIP` prefix (underline is visible because of hover) ![wipless_title](/uploads/72a6f7119ba9d8043ca8329641e97c3b/wipless_title.png) ## Link to remove `WIP` prefix ![wip_title](/uploads/8620ad65da9ef620b180603520fead55/wip_title.png) ## System note after WIP is added ![wip_sysnote](/uploads/2de073b75e854d2c9e243eb8b5d5c259/wip_sysnote.png) ## Widget with link to remove WIP ![wip_widget](/uploads/cf83ea93743c4c26d9df759c17cb9d7b/wip_widget.png) ## Flash after WIP is removed ![wip_flash](/uploads/27b7240cd5d7ceeb8b7b477abd94d7ff/wip_flash.png) ## System note after WIP is removed ![wipless_sysnote](/uploads/c0d3368abdf21a2f253532a9a9594d90/wipless_sysnote.png) ## Widget when current user cannot remove the WIP prefix ![wip_widget_unauthorized](/uploads/174ccf1674be86dc81c3078fe297acb7/wip_widget_unauthorized.png) cc @creamzy See merge request !3006
| * | | | | Remove CHANGELOG item that was added during merge resolutionremove-wipRémy Coutable2016-03-181-1/+0
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into remove-wipRémy Coutable2016-03-18827-10066/+15881
| |\ \ \ \ \
| * | | | | | Improve the "easy WIP & un-WIP from link" featureRémy Coutable2016-03-187-59/+53
| | | | | | |
| * | | | | | Merge branch 'master' into remove-wipDouwe Maan2016-02-2914-41/+181
| |\ \ \ \ \ \
| * | | | | | | Easily (un)mark merge request as WIP using linkDouwe Maan2016-02-266-7/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3768
| * | | | | | | Use specialized system notes when MR is (un)marked as WIPDouwe Maan2016-02-264-1/+36
| | | | | | | |
* | | | | | | | Merge branch 'fix/gitlab-omniauth-issue' into 'master' Douwe Maan2016-03-191-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attempting to fix omniauth problem Attempt to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/3361 See merge request !2876
| * | | | | | | another attempt to fix oauth issueJames Lopez2016-02-191-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-02-1998-490/+1492
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/gitlab-omniauth-issue
| * | | | | | | | attempting to fix omniauth problemJames Lopez2016-02-181-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'label-tooltip' into 'master' Douwe Maan2016-03-197-13/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add label description in tooltip to labels in issue index and sidebar The tooltip can get quite big, but it’s so useful to inform people about what these labels mean new ![Screen_Shot_2016-03-08_at_11.48.28](/uploads/894baaaa1f789c3a2069a924d541e64b/Screen_Shot_2016-03-08_at_11.48.28.png) ![Screen_Shot_2016-03-08_at_11.48.20](/uploads/efe4fa0960054c4071b8f6bf83024403/Screen_Shot_2016-03-08_at_11.48.20.png) @JobV writes on Slack: > yeah I think it’s better than not, but I’d have to try it :smiley: > > cautious yes, revert if it’s annoying :wink: See merge request !3124
| * | | | | | | | | Fix specslabel-tooltipRémy Coutable2016-03-182-3/+11
| | | | | | | | | |
| * | | | | | | | | Add label description in tooltip to labels in issue index and sidebarDouwe Maan2016-03-165-10/+12
| | | | | | | | | |
* | | | | | | | | | Merge branch 'issue-branch-iid-postfix' into 'master' Douwe Maan2016-03-194-9/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #to_branch_name now uses the iid as postfix Given the branch name 'mep-mep' with an iid being 1, the current way, master's way, would yield a branch name of 1-mep-mep. The problem for larger projects however would be that a developer might forget what iid the issue was. When this developer would try to tab complete it would: - Or result in 20+ branches possibly - Or start with the wrong digit, try again with digit++ - Would see 20 branches, repeat Thus the obvious way of solving this is letting the dev tab complete on the issue title, which is easier to remember. @DouweM Should this be labelled `pick-in-master`? See merge request !3308
| * | | | | | | | | | \#to_branch_name now uses the iid as postfixissue-branch-iid-postfixZeger-Jan van de Weg2016-03-184-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given the branch name 'mep-mep' with an iid being 1, the current way, master's way, would yield a branch name of 1-mep-mep. The problem for larger projects however would be that a developer might forget what iid the issue was. When this developer would try to tab complete it would: - Or result in 20+ branches possibly - Or start with the wrong digit, try again with digit++ - Would see 20 branches, repeat Thus the obvious way of solving this is letting the dev tab complete on the issue title, which is easier to remember.
* | | | | | | | | | | Merge branch 'master' into 'master' Achilleas Pipinellis2016-03-191-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add information about `image` and `services` field at `job` level in the `.gitlab-ci.yml` documentation Fixes #14366 /cc @tmaczukin @ayufan @axil See merge request !3277
| * | | | | | | | | | fixed md anchor linkPat Turner2016-03-181-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/14366Pat Turner2016-03-181-2/+2
| | | | | | | | | | |
| * | | | | | | | | | removed anchor as unsupported in markdownPat Turner2016-03-171-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/14366Pat Turner2016-03-171-0/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix/14418' into 'master' Robert Speicher2016-03-183-23/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dedupe labels in labels selector in Dashboard pages Fixes #14418. See merge request !3311
| * | | | | | | | | | Dedupe labels in labels selector in Dashboard pagesfix/14418Rémy Coutable2016-03-183-23/+9
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also moved useless helper methods and directly to the DashboardController.
* | | | | | | | | | Merge branch 'no-gc-retry' into 'master' Robert Speicher2016-03-183-3/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not retry "git gc" To prevent 'git gc' timing out on a large repo and then bouncing around in the retry queue. See merge request !3266
| * | | | | | | | | | Fix HousekeepingService testsno-gc-retryJacob Vosmaer2016-03-181-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Do not retry "git gc"Jacob Vosmaer2016-03-172-1/+11
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix/14388' into 'master' Douwe Maan2016-03-183-1/+27
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an issue when the target branch of a MR had been deleted Before displaying the "diverged commits" note, we're checking if the MR is open, but we should check if it's mergeable instead because this check ensure the source and target branches exist. This was introduced by !2217 and fixes #14388. See merge request !3294
| * | | | | | | | | | | Add a safeguard in MergeRequest#compute_diverged_commits_countRémy Coutable2016-03-183-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to ensure source_sha and target_sha are not nil before calling Gitlab::Git::Commit.between.
| * | | | | | | | | | | Fix an issue when the target branch of a MR had been deletedRémy Coutable2016-03-182-1/+2
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before displaying the "diverged commits" note, we're checking if the MR is open, but we should check if it's mergeable instead because this check ensure the source and target branches exist. This was introduced by !2217 and fixes #14388.
* | | | | | | | | | | Merge branch 'refactor-ui-lists' into 'master' Dmitriy Zaporozhets2016-03-1814-76/+61
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor colors and lists * Introduce 2 color links: black and blue * Use black color link for UI elements like lists * Refactor lists to use .title nested under li * Make all lists (events, todos, activity, projects etc) use style * List colorschema is now 333 for links and 555 for text Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @jschatz1 @skyruler See merge request !3307