home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,345 Commits 48 Branches 340 Tags
ea83df0fd50d6c03642aaa712ee2e80ea5c1eaab
Commit Graph
26345 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Grzegorz BizonandYorick Peterse ea83df0fd5 Add specs for sessions controller including 2FA 
This also contains specs for a bug described in #14900
 2016-04-08 12:04:12 +02:00
Felipe ArturandYorick Peterse 8828e45c68 Improve code 2016-04-08 12:04:12 +02:00
Felipe ArturandYorick Peterse cc52d4751a Improve code 2016-04-08 12:04:12 +02:00
Felipe ArturandYorick Peterse a33095d435 Fix problem when creating milestones in groups without projects 2016-04-08 12:04:12 +02:00
Yorick Peterse 265f796b0e Version 8.7.0-rc2 v8.7.0-rc2 2016-04-07 12:32:27 +02:00
Yorick Peterse d7c647f5bb Merge branch 'master' into 8-7-stable 2016-04-07 12:01:47 +02:00
Rémy Coutable 144912851c Merge branch 'update_main_lang_if_unset' into 'master' 
Only update main language if it is not already set

Related to gitlab-org/gitlab-ce#14937 (but does not fully fix) This is a temporary fix so performance isn't affected so much. 

cc @yorickpeterse @ayufan how does this look?

See merge request !3556
 2016-04-07 09:41:51 +00:00
Rémy Coutable 92897d7683 Merge branch 'api-filter-milestone' into 'master' 
API: Ability to filter milestones by state

Ability to filter milestones by `active` and `closed` state.

* Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14931

See merge request !3566
 2016-04-07 08:45:35 +00:00
Rémy Coutable 8eae7b1088 Merge branch 'feature/expose-builds-badge' into 'master' 
Expose badges

This MR exposes badge somewhere in visible place.

![expose_badges](/uploads/d2e290d3013d1ef2b1bdeebbbe2c5d8b/expose_badges.png)

Closes #13801

See merge request !3326
 2016-04-07 08:40:15 +00:00
Rémy Coutable d62a3decf9 Merge branch 'fix_14638' into 'master' 
Fixes #14638.

The SQL query was ambiguous and in this case we want to filter projects.

See merge request !3462
 2016-04-07 08:35:38 +00:00
Rémy Coutable 2817c54137 Merge branch 'return-303-for-branch-deletion' into 'master' 
Return status code 303 after a branch DELETE operation to avoid project deletion

Closes #14994

See merge request !3583
 2016-04-07 08:27:37 +00:00
Jeroen van Baarsen 7266972b52 Merge branch 'update-coveralls' into 'master' 
Update coveralls from 0.8.9 to 0.8.13 and simplecov from 0.10.0 to 0.11.2

This removes a few dependencies! It was also rude to be using coveralls
0.8.9, considering 0.8.12 introduced support for GitLab CI :) Also
paves the way for updating mime-types to 3.0.

Coveralls Changelog:
https://github.com/lemurheavy/coveralls-ruby/releases

Simplecov Changelog:
https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md

See merge request !3584
 2016-04-07 06:42:29 +00:00
Robert Schilling f5fdf20d76 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-04-07 08:21:04 +02:00
Robert Schilling e684063b21 Merge branch 'patch-1' into 'master' 
Fix typo in .gitlab-ci.yml doc. [ci skip]



See merge request !3581
 2016-04-07 06:19:33 +00:00
connorshea 50ef9fcafb Update coveralls from 0.8.9 to 0.8.13 and simplecov from 0.10.0 to 0.11.2 
This removes a few dependencies! It was also rude to be using coveralls
0.8.9, considering 0.8.12 introduced support for GitLab CI :) Also
paves the way for updating mime-types to 3.0.

Coveralls Changelog:
https://github.com/lemurheavy/coveralls-ruby/releases

Simplecov Changelog:
https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md
 2016-04-06 23:54:28 -06:00
Stan Hu 924e4b3700 Return status code 303 after a branch DELETE operation to avoid project deletion 
Closes #14994
 2016-04-06 21:11:10 -07:00
Robert Speicher 8f0945311b Merge branch 'anti-memoizer-mr-fix' into 'master' 
Reset merge request widget options

Fixes #14986 

See merge request !3582
 2016-04-07 03:00:51 +00:00
Jacob Schatz b471c76bcb Reset MR opts 2016-04-06 21:46:12 -04:00
Robert Speicher 936be025cd Merge branch 'saml-external-groups' into 'master' 
Allow SAML to identify external users and set them as such

Related to #4009

Fixes #14577

This allows SAML to retrieve group information form the `SAML Response`
and match that to a setting that will flag all matching users as external.

See merge request !3530
 2016-04-07 00:35:08 +00:00
Robert Speicher 730625f022 Merge branch 'patch/fix-markdown-preview-wikis' into 'master' 
Wiki preview URL converting problem [via Markdown]

Current implementation when rendering the preview, thinks relative links are for project repository files.

We are creating a new preview route that will define correct context data to render for wikis instead.

Fixes #2380, #1184

See merge request !3461
 2016-04-07 00:17:21 +00:00
Patricio Cano 8110e75309 Implemented suggested fixes 2016-04-06 18:12:25 -05:00
Gabriel Mazetto 1575a95b65 little refactor and improvements on specs 2016-04-06 20:09:15 -03:00
Jacob Schatz 7c6c933c9f Merge branch 'issue_14952' into 'master' 
Do not add location badge when creating a group or project

Closes #14952 

![](/uploads/778d0cbccffc717d601a91528ca8eb3c/Screen_Shot_2016-04-05_at_5.34.10_PM.png)

![](/uploads/dbd9eb06b510a6ac091dcf2e3fcb9c88/Screen_Shot_2016-04-05_at_5.34.21_PM.png)

See merge request !3555
 2016-04-06 22:55:15 +00:00
frodsan 71b5010a94 [ci skip] Fix typo. 2016-04-06 22:45:56 +00:00
Jacob Schatz d2f7813078 Merge branch '14866-url-overflow' into 'master' 
Wrap code blocks to next line

Closes #14866 

![Screen_Shot_2016-04-06_at_9.27.06_AM](/uploads/8bed5c17b17c9d15fe34dc7161d31e09/Screen_Shot_2016-04-06_at_9.27.06_AM.png)

See merge request !3573
 2016-04-06 22:25:30 +00:00
Achilleas Pipinellis 3a40e523a2 Merge branch 'doc-missing-ticks' into 'master' 
Fix missing entries in permission matrix [ci skip]

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

See merge request !3580
 2016-04-06 21:54:42 +00:00
Robert Speicher 5bdc18c5b3 Merge branch 'patch/fix-ldap-unblock-user-logic' into 'master' 
Unblocks user when active_directory is disabled and it can be found

We implemented a specific block state to handle user blocking that originates from LDAP filtering rules / directory state in !2242. 

That introduced a regression in LDAP authentication when Active Directory support was disabled. You could have a scenario where the user would not be temporarily found (like a filtering rule), that would mark the user as `ldap_blocked`, but will never unblock it automatically when that state changed.

Fixes #14253, #13179, #13259, #13959

See merge request !3550
 2016-04-06 21:50:40 +00:00
Robert Schilling 43b9217705 Fix missing entries in permission matrix [ci skip] 2016-04-06 23:49:12 +02:00
Annabel Dunstone 86d346b6f4 Change word-break to word-wrap 2016-04-06 14:40:29 -07:00
Alfredo Sumaran bfcee4a51d Merge branch 'master' into issue_14952 2016-04-06 16:35:04 -05:00
Alfredo Sumaran 946b4519c9 Use .new_record? instead 2016-04-06 16:31:34 -05:00
Robert Schilling bc701284f2 Fix missing entries in permission matrix [ci skip] 2016-04-06 23:27:42 +02:00
Jacob Schatz b6d5fcd477 Merge branch 'issue_14800' into 'master' 
Search Design fixes

Closes #14800 

- Use colors according to design
- Fix width of search input


![Screen_Shot_2016-04-05_at_11.12.33_AM](/uploads/83681ccd90a1a1542c056fd6dbc974d0/Screen_Shot_2016-04-05_at_11.12.33_AM.png)

![Screen_Shot_2016-04-05_at_11.11.54_AM](/uploads/f7557bea2ae055f3550b89751fd7d371/Screen_Shot_2016-04-05_at_11.11.54_AM.png)

See merge request !3475
 2016-04-06 21:26:56 +00:00
Patricio Cano eb0f1de36c Added CHANGELOG item 2016-04-06 16:21:58 -05:00
Douwe Maan fe132f52e8 Merge branch 'fix-markdown-rendering' into 'master' 
Fix header link rendering when containing numbers

This fixes the problem where Markdown such as:

    ### 31st

Would get rendered as a link tag pointing to issue number 31 inside a
header tag.

See gitlab-org/gitlab-ce#14936 for more information.

cc @rspeicher 

See merge request !3568
 2016-04-06 21:19:12 +00:00
Patricio Cano b95ac0962c Added documentation 2016-04-06 16:04:11 -05:00
Patricio Cano 3a36fa8957 Fix error that was causing only one group to be returned and corrected specs to use the proper attribute type 2016-04-06 16:03:35 -05:00
Robert Schilling b3dd470854 Fix wrong changelog item 2016-04-06 22:46:07 +02:00
Annabel Dunstone dcdf0b2af2 Horizontally scroll code blocks instead of wrapping 2016-04-06 13:20:58 -07:00
Annabel Dunstone ebb91c7f04 Wrap code blocks to next line 2016-04-06 13:20:58 -07:00
Drew Blessing 935bf7271d Only update main language if it is not already set 2016-04-06 14:56:40 -05:00
Robert Schilling 2c6472390d Merge branch 'revert-api-retrieve-tag' into 'master' 
Revert "API: Ability to retrieve a single tag"

This reverts commit 7f287c9136.

See merge request !3575
 2016-04-06 19:46:04 +00:00
Alfredo Sumaran d1ad639010 Do not fire blur event when clicking a suggestion 2016-04-06 14:28:15 -05:00
Jacob Schatz 452d1d4a8c Merge branch 'dropdown-enter-select-fix' into 'master' 
Fixed issue with enter key not selecting correct value in dropdown



See merge request !3563
 2016-04-06 19:16:23 +00:00
Jacob Schatz 61d0cf0c61 Merge branch 'delete-icon-color' into 'master' 
Fixed delete comment button color

![Screen_Shot_2016-04-06_at_09.55.38](/uploads/526c03db67b0fc7dc9876439f4be2b6b/Screen_Shot_2016-04-06_at_09.55.38.png)

See merge request !3562
 2016-04-06 19:13:46 +00:00
Jacob Schatz 205af25a33 Merge branch '14342-merge-button' into 'master' 
Update shades of red

Closes #14342 

Before:
![Screen_Shot_2016-04-05_at_12.11.44_PM](/uploads/58cf841fe9527a222bcf70c64f93e2fc/Screen_Shot_2016-04-05_at_12.11.44_PM.png)

Fixed:
![Screen_Shot_2016-04-05_at_12.10.56_PM](/uploads/98358b6a20aaee2ca777eee87075085e/Screen_Shot_2016-04-05_at_12.10.56_PM.png)

See merge request !3549
 2016-04-06 19:08:49 +00:00
Robert Schilling dc3272dccb Revert "API: Ability to retrieve a single tag" 
This reverts commit 7f287c9136.
 2016-04-06 21:03:24 +02:00
Alfredo Sumaran 5f4ce722c0 Display clear button only if input has a value 2016-04-06 13:55:49 -05:00
Robert Schilling e6215a9a8e Improve coding and doc style 2016-04-06 20:53:17 +02:00
Robert Schilling 0728588c34 API: Ability to filter milestones by state 2016-04-06 20:39:43 +02:00