home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,497 Commits 48 Branches 340 Tags
b96d049e15b8ee69a6013b977de731bc3cedbbca
Commit Graph
25497 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alfredo Sumaran b96d049e15 Merge branch 'master' into issue_3400_port 2016-03-18 18:08:06 -05:00
Alfredo Sumaran 3898bffd62 Code improvements 2016-03-18 17:35:26 -05: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
Alfredo Sumaran 79a4292ffd Merge branch 'issue_3400_port' of https://gitlab.com/gitlab-org/gitlab-ce into issue_3400_port 2016-03-18 15:27:40 -05: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
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
Jacob Schatz 46f9790ceb Fixing rebase conflicts 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz cdd7e1855e Fixes failing spec 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz 73e043d196 Delete unused file 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz 53df7263b7 Use new dropdown class for search suggestions 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz 2d0f8f928c Disable highlighting by default 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz b5bd497a1f Allow to hightlight matches 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz f858ee43ea Allow to pass header items 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz 4e486c6116 Allow to pass input filter param 
This allow us to set a different input to filter results
 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz 0b893bec54 Allow data with desired format 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz a0c1aa6d04 Allow to pass non-asynchronous data to GitLabDropdown 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz dccda7d09f Replace spinner icon for th FontAwesome one 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz 2541f59227 Better wording 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz ec0dfff204 Add icons 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz 82e3c1f257 Change hidden input id to avoid duplicated IDs 
The TODOs dashboard already had a #project_id input and it was causing a spec to fail
 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz 5479795708 Tweak behaviours 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz 6a7f4a0767 Apply styling and tweaks to autocomplete dropdown 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz c9e202c1d7 Working version of autocomplete with categorized results 2016-03-18 14:06:51 -04: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