home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 12:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,479 Commits 48 Branches 340 Tags
09cd4351fa17ffcae3b5ce960e562a7ced6facfe
Commit Graph
25479 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Achilleas Pipinellis 09cd4351fa Remove redundant word 
[ci skip]
 2016-03-22 13:11:18 +02:00
Achilleas Pipinellis e53707fc9e Refactor award emoji doc a bit 
[ci skip]
 2016-03-22 12:59:28 +02:00
Achilleas Pipinellis f4a13f0844 Fix grammar in intro guide 2016-03-22 12:56:52 +02:00
Achilleas Pipinellis 05ca1096dd Merge Git basics into Start using Git 
[ci skip]
 2016-03-22 12:01:13 +02:00
Achilleas Pipinellis 1030ebb89f Add award emoji docs 
[ci skip]
 2016-03-22 11:50:16 +02:00
Achilleas Pipinellis e8585d29ef Change titles to be more descriptive 2016-03-22 11:49:26 +02:00
Achilleas Pipinellis 72517915f8 Remove blockquotes 2016-03-21 22:51:26 +02:00
Achilleas Pipinellis daf5b10905 Simplify install and update section 
[ci skip]
 2016-03-19 15:42:24 +02:00
Achilleas Pipinellis f4bbc67115 Add h1 heading 2016-03-19 15:42:03 +02:00
Achilleas Pipinellis ce13cfc626 Add more options and missing links 
[ci skip]
 2016-03-19 15:07:00 +02:00
Achilleas Pipinellis c8265f13ca Merge branch 'master' into gitlab_intro_docs 2016-03-19 14:43:52 +02: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
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
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