home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,292 Commits 48 Branches 340 Tags
3b520efdc7ff00e291464a7c191db12e4d191bfe
Commit Graph
24292 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Yorick Peterse 3b520efdc7 Moved exists condition in Repository#before_delete 
This is only needed when calling the "expire_cache" method as the other
expiration methods don't depend on Git data.
 2016-02-25 12:55:37 +01:00
Yorick Peterse a39f7b30c5 Move Repository#expire_all_caches to before_delete 2016-02-23 12:27:34 +01:00
Yorick Peterse ff28a7cc36 Moved cache expiration code to Repository hooks 
This keeps all the cache expiration code in a single file/class instead
of spreading it all across the codebase.
 2016-02-23 12:02:59 +01:00
Kamil Trzciński 884094a77e Merge branch 'ci/extend-summary-status-specs' into 'master' 
Extend specs for summary build status

Additional specs cover a case when one of the builds is running but
allowed to fail. Previous implementation returned `running` status,
which is wrong. This behavior has been changed in 8.5, this commit adds
missing specs.

See merge request !2904
 2016-02-23 10:07:55 +00:00
Robert SpeicherandRémy Coutable e6195b859f Merge branch 'fix-autocomplete-spec' into 'master' 
Fix volatile spec.

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/312.

See merge request !206
 2016-02-23 10:11:39 +01:00
Jacob Schatz 7c80998536 Merge branch 'project-type-icon-your-projects' into 'master' 
Show project visibility level on project list

Fixes #3779

![Screen_Shot_2016-02-22_at_10.08.58](/uploads/611cc8aa2d12591d4fe6a70ba0f45d68/Screen_Shot_2016-02-22_at_10.08.58.png)

See merge request !2908
 2016-02-22 20:34:31 +00:00
Jacob Schatz 54a5b8831a Merge branch 'blame-line-link' into 'master' 
Added line links to blame table

Closes #4119

See merge request !2915
 2016-02-22 20:29:38 +00:00
Robert Speicher d10b43dae3 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-02-22 15:24:20 -05:00
Robert Speicher 9871612d50 Add missing word to GitLab Flow doc 
[ci skip]
 2016-02-22 15:23:11 -05:00
Rémy Coutable 493d166d66 Merge branch 'fix/13631-error-with-merged-mr' into 'master' 
Ensure we don't check a commit's description for revert message if it has no description

Fixes #13631.

/cc @razer6 @grzesiek @yorickpeterse @rdavila 

See merge request !2917
 2016-02-22 18:13:46 +00:00
Robert Speicher 7479f0602e Merge branch 'saml-link-default' into 'master' 
Properly set `auto_link_saml_user` default value in the Settings loader.

See merge request !2922
 2016-02-22 17:48:23 +00:00
Jacob Schatz 81e5c9c289 Merge branch 'fix-moving-revert-button' into 'master' 
Fixed revert button tooltip placement causing movement

Before:

![moving-tooltip](/uploads/65cb9a41e8b8114fd8ee10d68cfd8206/moving-tooltip.gif)

After:

![moving-tooltip](/uploads/a1c36eb5735dc7592c49f6b5cb1469b5/moving-tooltip.gif)

See merge request !2910
 2016-02-22 17:37:34 +00:00
Sytse Sijbrandij b31c68aa2a Make sure we recommend 2GB 2016-02-22 17:35:18 +00:00
Rémy Coutable 96ed5c5114 Ensure we don't check a commit's description for revert message if it has no description 2016-02-22 18:33:02 +01:00
Jacob Schatz 96ce80d578 Merge branch 'status-indicator-size' into 'master' 
Changed the size of status indicators

![Screen_Shot_2016-02-22_at_12.53.25](/uploads/229593bf76a78a2ce658c565d805716a/Screen_Shot_2016-02-22_at_12.53.25.png)

![Screen_Shot_2016-02-22_at_12.53.36](/uploads/d328809a3288943a47bed2cf13611a03/Screen_Shot_2016-02-22_at_12.53.36.png)

Closes #12763

See merge request !2913
 2016-02-22 17:06:40 +00:00
Jacob Schatz 6fb523d2bf Merge branch 'header-overflow-small-devices' into 'master' 
Fixed issue with header overflow

Fixes #13492

Before:

![Screen_Shot_2016-02-22_at_15.32.42](/uploads/aefec4e67368d0387f22448be8eea65c/Screen_Shot_2016-02-22_at_15.32.42.png)

After:

![Screen_Shot_2016-02-22_at_15.32.09](/uploads/76b0d96cd5d9a4076c9d0883aaaba003/Screen_Shot_2016-02-22_at_15.32.09.png)

See merge request !2921
 2016-02-22 17:00:43 +00:00
Patricio Cano 99edb2a0aa Properly set auto_link_saml_user default value in the Settings loader. 2016-02-22 11:59:15 -05:00
Douwe Maan df1cdefe88 Merge branch 'improve-merge-when-succeeded' into 'master' 
Check the HEAD of branch when doing Merge When Succeeded

Implements https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2894#note_3845158

cc @DouweM @grzesiek 


See merge request !2907
 2016-02-22 16:51:04 +00:00
Robert Speicher 8c4cfb1fee Merge branch 'rs-mask-icon' into 'master' 
Add a Pinned Tab icon for Safari

See http://apple.co/1SCRzrw

Closes #13540

[ci skip]

See merge request !2883
 2016-02-22 16:34:46 +00:00
Jacob Schatz 1ab5eb93eb Merge branch 'issue-sidebar-content-scrolling' into 'master' 
Fixed issue with content in the issue sidebar disappearing

Closes #13626

See merge request !2919
 2016-02-22 16:26:30 +00:00
Phil Hughes 7f1c26cfee Fixed issue with header overflow 
Fixes #13492
 2016-02-22 15:31:19 +00:00
Phil Hughes d14889c294 Fixed issue with content in the issue sidebar disappearing 
Closes #13626
 2016-02-22 14:58:25 +00:00
Jacob Schatz 5803a5308f Merge branch 'issue_13463' into 'master' 
Fix Side-by-side view after loading diff results

Fixes #13463

See merge request !2880
 2016-02-22 14:35:06 +00:00
Phil Hughes 416b49d3f0 Changed the size of status indicators 
Closes #12763
 2016-02-22 14:11:41 +00:00
Phil Hughes fbc578a7ec Added line links to blame table 
Closes #4119
 2016-02-22 14:09:13 +00:00
Phil Hughes aa1ac6368e Fixed revert button tooltip placement causing movement 2016-02-22 12:55:28 +00:00
Achilleas Pipinellis f51d8af5a7 Merge branch 'add_missing_doc' into 'master' 
Add when the API changes got introduced



See merge request !2912
 2016-02-22 12:34:41 +00:00
Achilleas Pipinellis 13fd08b157 Add when the API changes got introduced 
[ci skip]
 2016-02-22 14:30:22 +02:00
Rémy Coutable 4c3c67a71e Merge branch 'fix-failing-issue-tests' into 'master' 
Fixed failing issues tests

Also removed up/down vote icons from merge requests. Was missed from d8069bd858

See merge request !2911
 2016-02-22 12:23:08 +00:00
Phil Hughes 7bdddb481d removed merge-request-no-votes css class 2016-02-22 11:50:26 +00:00
Rémy Coutable a612ac1cb4 Update CHANGELOG and VERSION for 8.6.0-pre 2016-02-22 12:41:13 +01:00
Phil Hughes 51c17329a4 Fixed failing issues tests 
Removed up/down vote icons from merge requests. Was missed from d8069bd858
 2016-02-22 11:35:52 +00:00
Rémy Coutable 1d9863c141 Merge branch 'fix-zero-votes-showing-on-issue-list' into 'master' 
Only show up or down votes icon on issue list if there are any

Closes #13649 

![Screen_Shot_2016-02-22_at_10.20.27](/uploads/21477426856dab9731bb110032025867/Screen_Shot_2016-02-22_at_10.20.27.png)

See merge request !2909
 2016-02-22 10:24:44 +00:00
Phil Hughes d8069bd858 Only show up or down votes icon on issue list if there are any 
Closes #13649
 2016-02-22 10:21:02 +00:00
Phil Hughes 49a95d9858 Show project visibility level on project list 
Fixes #3779
 2016-02-22 10:08:44 +00:00
Kamil Trzcinski 7c288c07f1 Check the HEAD of branch when doing Merge When Succeeded 2016-02-22 10:34:09 +01:00
Douglas Barbosa Alexandre 04d1b41258 Merge branch 'tasks' into 'master' 
Add Todos

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

Tasks:

-  Prepare database
 - [X] Create a new table (`todos`)
- Tasks Queue view
 - [X] Add a number icon showing the number of todos on the top right next to the new and logout button that will redirect the user to the todos page
 - [X] Add a chronological list of todos, with the 'Todos' tab active by default
 - [X] Add a 'Done' button to each todo
 - [x] Add filters (project, author, type, and action)
- Todos generation
 - [X] When user issue/mr is assgined to someone
 - [x] When user is mentioned on (issues/mr's/comments)
- Mark todo as `done`
 - [X] When clicks on the 'Done' button
 - [X] When edit issue/mr
 - [X] When left/edit a comment
 - [X] When reassign issue/mr
 - [X] When add/remove labels to issue/mr
 - [X] When issue/mr is closed
 - [X] When mr is merged
 - [X] When added an emoji
 - [X] When changed the issue/mr milestone

* Screenshot:

![Screenshot_2016-02-20_12.45.57](/uploads/4b2554b1bde25aed3347e1ae41e8e0c0/Screenshot_2016-02-20_12.45.57.png)

See merge request !2817
 2016-02-22 02:36:41 +00:00
Douwe Maan 28f9b54372 Merge branch 'merge-when-succeeded' into 'master' 
Fix bugs in MergeWhenSucceeded

1. This fixes support for merge when succeeded for statuses without ref.
2. This fixes support for merge when succeeded for multiple stages. Stages are created after all builds for previous one are finished.

Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/9060 https://gitlab.com/gitlab-org/gitlab-ce/issues/8108 https://gitlab.com/gitlab-org/gitlab-ce/issues/12931 https://gitlab.com/gitlab-org/gitlab-ce/issues/13269

/cc @grzesiek @DouweM @rspeicher 


See merge request !2894
 2016-02-22 00:38:51 +00:00
Douglas Barbosa Alexandre 2ef1ea501f Add missing route to mark all todos as done 2016-02-21 12:57:12 -03:00
Douglas Barbosa Alexandre f37765efa2 Use before_action instead of before_filter 2016-02-21 12:52:37 -03:00
Jacob Schatz 1367caa642 Merge branch 'award-emoji-retina' into 'master' 
Award emoji supports retina displays

Based on discussion in !2800

There is now a retina spritesheet for emojis. It is 2mb, don't know how big an issue that is.

Before:

![Screen_Shot_2016-02-19_at_11.07.25](/uploads/ea412579bcaddfd13fce67bf583de61b/Screen_Shot_2016-02-19_at_11.07.25.png)

After:

![Screen_Shot_2016-02-19_at_11.07.36](/uploads/9d44c6278ba31987bad03dc1f46edd8b/Screen_Shot_2016-02-19_at_11.07.36.png)

Also updated the rake task to make the @2x spritesheet https://gitlab.com/snippets/15348

cc\ @rspeicher @vsizov 

See merge request !2891
 2016-02-20 20:38:27 +00:00
Douwe Maan 7f30268545 Update feature spec 2016-02-20 12:05:57 -08:00
Douwe Maan 42cbcb2347 "X assigned you Y" instead of "X assigned Y" 2016-02-20 12:01:55 -08:00
Douwe Maan d53ae7f14d Add "Mark all as done" button 2016-02-20 11:59:19 -08:00
Douwe Maan 9ae8fb9307 Merge branch 'flush-cache-web-editor' into 'master' 
Flush emptiness caches whenever needed



See merge request !2903
 2016-02-20 19:54:16 +00:00
Douwe Maan 57d16552ff Include 'issue'/'merge request' in link 2016-02-20 11:53:15 -08:00
Douwe Maan 0e9775816a Rename tab from 'Todos' to 'To do' 2016-02-20 11:52:57 -08:00
Yorick Peterse e0cb3212ed Flush emptiness caches whenever needed 
This ensures that the emptiness cache (used for Repository#empty? and
Repository#has_visible_content?) is flushed after comitting changes
(using the web editor, API or Git) for new repositories. Once a
repository is no longer empty there's no need to explicitly flush the
cache for Repository#empty?. The cache for
Repository#has_visible_content? in turn is already flushed whenever
needed.

Fixes gitlab-org/gitlab-ce#13387
 2016-02-20 20:17:50 +01:00
Grzegorz Bizon c8b4c874d7 Extend specs for summary build status 
Additional specs cover a case when one of the builds is running but
allowed to fail. Previous implementation returned `running` status,
which is wrong. This behavior has been changed in 8.5, this commit adds
missing specs.
 2016-02-20 16:35:29 +01:00
Douglas Barbosa Alexandre f42b1fa6e5 Fix rubucop offenses 2016-02-20 13:10:37 -02:00