Commit Graph
25472 Commits
Author SHA1 Message Date
Douwe Maan a8aa59e96e Inline mailer CSS using premailer.
# Conflicts:
#	Gemfile.lock
2016-03-19 20:04:10 +01:00
Douwe Maan 0ce7c1e494 Merge branch 'label-tooltip' into 'master'
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 😃 
> 
> cautious yes, revert if it’s annoying 😉

See merge request !3124
2016-03-19 18:55:12 +00:00
Douwe Maan cb124d1476 Merge branch 'issue-branch-iid-postfix' into 'master'
#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
2016-03-19 18:54:18 +00:00
Achilleas Pipinellis 4f0302f00e Merge branch 'master' into 'master'
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
2016-03-19 08:27:05 +00:00
Robert Speicher 18fc7c66f4 Merge branch 'fix/14418' into 'master'
Dedupe labels in labels selector in Dashboard pages

Fixes #14418.

See merge request !3311
2016-03-18 21:40:46 +00:00
Rémy Coutable 733ae58798 Dedupe labels in labels selector in Dashboard pages
Also moved useless helper methods and directly to the
DashboardController.
2016-03-18 21:49:56 +01:00
Robert Speicher c790107854 Merge branch 'no-gc-retry' into 'master'
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
2016-03-18 20:26:40 +00:00
Rémy Coutable 9d15814eb0 Fix specs 2016-03-18 20:26:30 +01:00
Douwe Maan 49534a6596 Merge branch 'fix/14388' into 'master'
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
2016-03-18 19:07:03 +00:00
Dmitriy Zaporozhets 5203a98411 Merge branch 'refactor-ui-lists' into 'master'
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
2016-03-18 18:35:19 +00:00
Zeger-Jan van de Weg 70ca3370eb \#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.
2016-03-18 19:34:04 +01:00
Dmitriy Zaporozhets daeed3fdf3 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>
2016-03-18 19:02:08 +01:00
Rémy Coutable bc92de8f03 Add a safeguard in MergeRequest#compute_diverged_commits_count
We have to ensure source_sha and target_sha are not nil before calling
Gitlab::Git::Commit.between.
2016-03-18 19:01:20 +01:00
Rémy Coutable 4a8a8282d9 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.
2016-03-18 19:01:20 +01:00
Jacob Schatz eba0032552 Merge branch 'add_avatar_to_issue_mr_header' into 'master'
Add avatar to issue and MR pages header

closes #14395
# For Issues

### Before
![Screen_Shot_2016-03-18_at_4.27.25_PM](/uploads/b097c8e304c9737e2f46ee25667829bf/Screen_Shot_2016-03-18_at_4.27.25_PM.png)

### After
![Screen_Shot_2016-03-18_at_4.22.10_PM](/uploads/f7d2b12c9455950c2e660b33e27c1827/Screen_Shot_2016-03-18_at_4.22.10_PM.png)

# For Merge Request

### Before
![Screen_Shot_2016-03-18_at_4.27.09_PM](/uploads/50c7b6ee346f749f448647004ae6031b/Screen_Shot_2016-03-18_at_4.27.09_PM.png)

### After
![Screen_Shot_2016-03-18_at_4.24.17_PM](/uploads/abd37ccf030e0b6d10521a6937206de6/Screen_Shot_2016-03-18_at_4.24.17_PM.png)

See merge request !3301
2016-03-18 17:58:43 +00:00
Dmitriy Zaporozhets 16c62f0d97 Merge branch 'refactor-variables' into 'master'
Refactor variables

Fixes #13803 and other color inconsistency across application

cc @jschatz1 @skyruler 

See merge request !3304
2016-03-18 17:42:39 +00:00
Douwe Maan 5100ad090b Merge branch 'trigger-todo-for-mentions-on-commits-page' into 'master'
Trigger a todo for mentions on commits page

Closes #14006 

* Screenshot:

![todo-commit](/uploads/5d34de0b7afcea7548123dafddf60c45/todo-commit.png)

See merge request !3262
2016-03-18 17:10:09 +00:00
Robert Speicher ba611fdb5d Merge branch 'filter-label-missing' into 'master'
Fixes issue with filter label missing on labels & milestones

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14407

See merge request !3297
2016-03-18 17:01:51 +00:00
Arinde Eniola 5e39846e4b Add avatar to issue and MR pages header 2016-03-18 17:54:44 +01:00
Dmitriy Zaporozhets 5e2728891e Cleanup somce css colors
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-18 17:48:52 +01:00
Dmitriy Zaporozhets 3837f4413a Re-group scss variables
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-18 17:37:10 +01:00
Douglas Barbosa Alexandre 02b0c37cab Refactor Todo#target 2016-03-18 13:27:27 -03:00
Phil Hughes 2f210adee2 Fixes issue with filter label missing on labels & milestones 2016-03-18 16:25:04 +00:00
Robert Speicher aee6dbc6de Merge branch 'rs-issue-14259' into 'master'
Prevent a 500 when a repository's root_ref is nil

Closes #14259

See merge request !3278
2016-03-18 16:24:51 +00:00
Douglas Barbosa Alexandre 2a8858ca8a Rename Todo#to_reference to Todo#target_reference
Since we're not actually returning a todo reference.
2016-03-18 13:24:47 -03:00
Robert Speicher 7a33afb760 Merge branch 'dashboard-labels' into 'master'
Dashboard labels

Previously because there were no JSON endpoint for labels or milestones
it was fetching HTML and parsing that. This is wrong.

It now fetches from a JSON endpoint.

This also fixes the dashboard/issues page not loading labels or
milestones as the path used to be only for a single project. So instead
I have created a endpoint for labels & milestones JSON on dashboard.

See merge request !3253
2016-03-18 16:04:55 +00:00
Phil Hughes a45cb68809 Fixed failing tests 2016-03-18 15:18:06 +00:00
Phil Hughes 0eecc21485 Updated controller with before_action
Fixed other issues based on feedback
2016-03-18 15:18:06 +00:00
Phil Hughes d847db79cb Fixes issue on dashboard issues
They would try to load JSON from a project even though it isn't a single project
2016-03-18 15:18:06 +00:00
Phil Hughes 645b7a0a33 Full labels data in JSON 2016-03-18 15:18:06 +00:00
Phil Hughes 0858cb097a Fixed issue with labels dropdown getting wrong labels 2016-03-18 15:18:06 +00:00
Jacob Schatz 9280fd4acd Merge branch 'fix-mr-close-button' into 'master'
Fixes issue with close button not working on MR

Closes #14383

See merge request !3295
2016-03-18 14:49:00 +00:00
Douglas Barbosa Alexandre 05975e96f9 Update CHANGELOG 2016-03-18 11:07:30 -03:00
Douglas Barbosa Alexandre 71cc3caa85 Use Note#for_project_snippet? to skip notes on project snippet 2016-03-18 11:07:30 -03:00
Douglas Barbosa Alexandre 231d4fb9f8 Use Commit#short_id instead of Commit.truncate_sha 2016-03-18 11:07:30 -03:00
Douglas Barbosa Alexandre 2eeeb266e3 Reuse for_commit? on conditional validations 2016-03-18 11:07:30 -03:00
Douglas Barbosa Alexandre a5bad46505 Update schema info comment on todo related files 2016-03-18 11:00:53 -03:00
Douglas Barbosa Alexandre fb72271e24 Use todo.done without ! in the controller to mark todo as done 2016-03-18 11:00:53 -03:00
Douglas Barbosa Alexandre c29da3f8ca Trigger a todo for mentions on commits page 2016-03-18 11:00:53 -03:00
Douglas Barbosa Alexandre 1e76245d4e Add commit_id to todos 2016-03-18 11:00:53 -03:00
Douglas Barbosa Alexandre 42834095bc Change target_id to null on todos 2016-03-18 11:00:53 -03:00
Jacob Schatz 8dfa0a7649 Merge branch 'improved-issue-sidebar' into 'master'
Improved issue sidebar

Updated the spacing throughout the sidebar so that it fits better on smaller screens. Also adds a more participants button to show any other participants after the first row.

Closes #13353

See merge request !3097
2016-03-18 13:50:22 +00:00
Jacob Vosmaer 5d9cf7b415 Fix HousekeepingService tests 2016-03-18 14:46:51 +01:00
Phil Hughes 195ef985f3 Added test 2016-03-18 12:42:30 +00:00
Achilleas Pipinellis e877cfda4d Merge branch 'docs_select_version_to_install' into 'master'
Add note in upgrade guide to choose the correct version tag

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3448

@rspeicher I'm assigning to you since as a release manager you should know better. Let's keep it in this guide for now and then start copying it in the future ones.

See merge request !2284
2016-03-18 12:37:59 +00:00
Achilleas Pipinellis e1ce7a47fa Add note in rest of update guides
[ci skip]
2016-03-18 14:35:04 +02:00
Achilleas Pipinellis 4d3e8ceea5 Merge branch 'master' into docs_select_version_to_install 2016-03-18 14:31:33 +02:00
Douwe Maan dadd28e317 Merge branch 'fix-mr-source-sha' into 'master'
Fix MergeRequest#source_sha when there is no diff

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14170

### Overview

This MR fixes an unhandled Exception when visiting the page of an open Merge Request  without diff.

### Description

`MergeRequest#source_sha` is expected to return the sha of the source branch last commit. But when an open Merge Request has no diff (e.g. all commits have already been merged to the target branch), `merge_request.source_sha` incorrectly returns `nil`.

This was without consequences before – but since !2217 was merged (a few days ago), it makes `Gitlab::Git::Commit.between` raise an "Unexpected nil argument" exception. This can be reproduced when visiting the http://localhost:3000/gitlab-org/gitlab-test/merge_requests/2 page on a fresh local Gitlab setup.

This MR fixes the crash, by making sure that `source_sha` returns a
correct result even when there is no diff available. I also added tests.

@DouweM I believe you wrote most of this code in the first place ; does this looks correct to you, or is there a better way to resolve this issue maybe?

See merge request !3135
2016-03-18 12:28:43 +00:00
Jacob Schatz f4b6a89252 Merge branch 'issue-fade-load' into 'master'
Changing filter dropdowns shows loading

Instead of doing a full refresh of the page - i've modified the filterResults method on the Issues object to work for this form as well

![issues](/uploads/3335f09f7df88b6d419de7fd3d6857d2/issues.gif)

Closes #14359

See merge request !3237
2016-03-18 12:25:09 +00:00
Douwe Maan 9813eac56b Merge branch 'confidential-issues' into 'master'
Add confidential issues

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3678

More information: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/227

See merge request !3282
2016-03-18 12:04:56 +00:00