home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,047 Commits 48 Branches 340 Tags
6d679fc34797fcf07a16e2f2ceea8113a07c534f
Commit Graph
17047 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 6d679fc347 Fix closed merge request scope at milestone page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 15:44:19 +02:00
Dmitriy Zaporozhets 8c54237020 Revert merge request states renaming 
Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 15:44:06 +02:00
Jacob Vosmaer baa699a75a Version 7.12.0 v7.12.0 2015-06-22 13:53:16 +02:00
Jacob Vosmaer bef405333c Merge branch '7-12-stable' of dev.gitlab.org:gitlab/gitlabhq into 7-12-stable 2015-06-22 12:25:09 +02:00
Dmitriy Zaporozhets 156edd8d6f Merge branch 'web-editor-autocrlf' into 'master' 
Convert CRLF newlines to LF when committing using the web editor.

Fixes #1823 and https://github.com/gitlabhq/gitlabhq/issues/7950.

Depends on https://gitlab.com/gitlab-org/gitlab_git/merge_requests/29 being merged and a new gitlab_git being released.

cc @jacobvosmaer

See merge request !858
 2015-06-22 12:21:51 +02:00
Jacob Vosmaer 87c67b1748 Merge branch '7-12-new-mr-disable-change-target-branch' into '7-12-stable' 
Disable changing of target branch in new merge request page when a branch has already been specified

Closes #1830

See merge request !856
 2015-06-22 10:00:54 +00:00
Jacob Vosmaer 3369916609 Merge branch '7-12-fix-error-500-internal-snippet' into '7-12-stable' 
Fix Error 500 when one user attempts to access a personal, internal snippet

Closes #1815

See merge request !857
 2015-06-22 09:57:10 +00:00
Stan Hu f7efd26575 Disable changing of target branch in new merge request page when a branch has already been specified 
Closes #1830
 2015-06-20 05:46:20 -07:00
Stan Hu c65634cf3a Fix Error 500 when one user attempts to access a personal, internal snippet 
Closes #1815
 2015-06-20 05:44:23 -07:00
Jacob Vosmaer d5cbdcc745 Version 7.12.0.rc3 v7.12.0.rc3 2015-06-18 18:16:06 +02:00
Jacob Vosmaer d8d8fe7632 Merge branch 'labels-permission-fix-7-12' into '7-12-stable' 
Fix 403 Access Denied error messages when accessing Labels section in a project

This occurs when MRs are enabled but issues are enabled

Closes #1813

See merge request !842
 2015-06-18 12:50:31 +00:00
Stan Hu b8fd21f91a Fix 403 Access Denied error messages when accessing Labels section in a project that has MRs disabled but issues enabled 
Closes #1813
 2015-06-18 04:54:49 -07:00
Jacob Vosmaer 71559a5fb4 Merge branch 'ldap-person-fix-7-12' into '7-12-stable' 
"Fix behavior of ldap_person method in Gitlab::OAuth::User" for 7.12

See !837

See merge request !840
 2015-06-18 10:46:32 +00:00
Douwe Maan a95a3f41f6 Merge branch 'fix/oauth_user_ldap_person' into 'master' 
Fix behavior of ldap_person method in Gitlab::OAuth::User

Code tweaks in 45e9150a caused the ldap_person method to not return expected results.
Improved tests to cover the ldap_person method, which was previously stubbed.

Restored the previous implementation of ldap_person, as I could not find a more concise to write it that still works with all the test cases.

See merge request !837
 2015-06-18 11:37:55 +02:00
Douwe Maan a3d98ab2dc Merge branch 'rs-custom-dashboard-backport' into '7-12-stable' 
Backport custom dashboard

This is a backport of !778 without the `Gitlab::Themes` refactor for the 7.12 branch.

See merge request !828
 2015-06-18 09:11:08 +00:00
Dmitriy Zaporozhets 15d7432cd4 Merge branch 'bump-gems' into '7-12-stable' 
Bump rails to 4.1.11, jquery-rails to 3.1.3 for stable

See merge request !832
 2015-06-17 08:37:13 +00:00
Dmitriy Zaporozhets aa6aa2e9ea Merge branch 'rs-rails-update' into 'master' 
Bump rails to 4.1.11, jquery-rails to 3.1.3

rails 4.1.11 notes - http://weblog.rubyonrails.org/2015/6/16/Rails-3-2-22-4-1-11-and-4-2-2-have-been-released-and-more/

jquery-rails < 3.1.3 security advisory: https://groups.google.com/forum/#!topic/ruby-security-ann/XIZPbobuwaY

See merge request !830
 2015-06-17 09:21:36 +02:00
Robert Speicher 41dadc37a5 Fix Preferences feature spec 2015-06-16 12:53:04 -04:00
Robert Speicher a28686d331 Fix preferences/show 2015-06-16 12:53:00 -04:00
Robert Speicher 42d8ebebb9 Fix doc typos 
cherry-picked
 2015-06-16 12:52:56 -04:00
Robert Speicher 0d4eb312d9 Add allowing_for_delay helper method for feature specs 
cherry-picked
 2015-06-16 12:52:52 -04:00
Robert Speicher f323b8c4e5 Refactor RootController 
cherry-picked
 2015-06-16 12:52:47 -04:00
Robert Speicher 7cff7d6fce Refactor dashboard_choices 
cherry-picked
 2015-06-16 12:52:40 -04:00
Robert Speicher 17af09b190 Remove redundant help text from custom dashboard selection 
cherry-picked
 2015-06-16 12:52:31 -04:00
Robert Speicher 2797daade9 Fix alignment of Behavior form; add documentation link 
cherry-picked
 2015-06-16 12:52:27 -04:00
Robert Speicher ba60b742e1 Move 2FA docs from "Workflow" to "Profile Settings" 
cherry-picked
 2015-06-16 12:52:22 -04:00
Robert Speicher 1779cbfe88 Add docs for Profile > Preferences 
Also converts doc/README.md to Unix line endings

cherry-picked
 2015-06-16 12:52:17 -04:00
Robert Speicher 2b4b05727d Spec the failure cases for PreferencesController#update 
cherry-picked
 2015-06-16 12:52:12 -04:00
Robert Speicher f22d80ad75 Make the dashboard choice text match the text in the sidebar 
cherry-picked
 2015-06-16 12:52:08 -04:00
Robert Speicher 8dfe01cbb0 Add feature specs for default dashboard preference 
cherry-picked
 2015-06-16 12:52:04 -04:00
Robert Speicher 878732b426 Add a form field to customize the dashboard preference 
cherry-picked
 2015-06-16 12:52:00 -04:00
Robert Speicher 5e0a812669 Account for RootController for dashboard navigation and Dispatch JS 
cherry-picked
 2015-06-16 12:51:56 -04:00
Robert Speicher bf44988a30 Add RootController 
This controller is now the target for `root_url`. It sub-classes
DashboardController so we can render the old default without a redirect
if the user hasn't customized their dashboard location.

cherry-picked
 2015-06-16 12:51:51 -04:00
Robert Speicher 7f702b33b9 Add dashboard attribute to User model 
cherry-picked
 2015-06-16 12:51:46 -04:00
Robert Speicher 122e83c326 Simplify the javascript behavior for Preference updating 
cherry-picked
 2015-06-16 12:51:42 -04:00
Robert Speicher 59ab9cc9fc Remove js handler from Profiles#update 
It was only used for the appearance live updating, which is now handled
by Profiles::Preferences#update

cherry-picked
 2015-06-16 12:51:34 -04:00
Robert Speicher 3cae81a597 Move the "Design" templates and logic to Preferences 
cherry-picked
 2015-06-16 12:51:23 -04:00
Robert Speicher 471ea73a56 Add Profiles::PreferencesController 
cherry-picked
 2015-06-16 12:51:02 -04:00
Jacob Vosmaer 41aead60c6 Version 7.12.0.rc2 v7.12.0.rc2 2015-06-16 17:48:26 +02:00
Dmitriy Zaporozhets 1fb54a2d6b Merge branch 'kerberos_require' into '7-12-stable' 
Kerberos require to stable 7.12

!819 to 7-12-stable

cc @jacobvosmaer

See merge request !827
 2015-06-16 14:23:37 +00:00
Dmitriy Zaporozhets f6ee9b3143 Merge branch '7-12-stable' of dev.gitlab.org:gitlab/gitlabhq into 7-12-stable 2015-06-16 15:26:24 +02:00
Dmitriy ZaporozhetsandMarin Jankovski 940d38b065 Merge branch 'require_kerberos_when_enabled' into 'master' 
If kerberos is enabled require it

Since 'group: :kerberos' got [included in the Gemfile ](https://gitlab.com/gitlab-org/gitlab-ce/commit/2391a43a7073b4e723e9ca1f7ff19b30f8e51452) Kerberos no longer got [loaded when the app started](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/application.rb#L6)

This caused `Devise::OmniAuth::StrategyNotFound` error once Kerberos is enabled, failing to start GitLab .

With this we hopefully do not need to remove group from the Gemfile.

See merge request !819
 2015-06-16 15:14:54 +02:00
Dmitriy Zaporozhets 5701879f73 Merge branch '7-12-rc2' into '7-12-stable' 
Fixes for RC2

we need it to make GitLab works with new CI

cc @jacobvosmaer

See merge request !1864
 2015-06-15 19:26:17 +00:00
Dmitriy Zaporozhets ddd04dec93 Fix .gitlab-ci.yml file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-15 18:41:09 +02:00
NicolasandDmitriy Zaporozhets b27ef08318 Fix typo on account page. 2015-06-15 18:36:33 +02:00
Dmitriy Zaporozhets 916d7da4a8 Merge branch 'fix-gitlab-ci-yml' into 'master' 
Look for .gitlab-ci.yml only if checkout_sha is present

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2396

cc @vsizov

See merge request !818
 2015-06-15 18:31:29 +02:00
Dmitriy Zaporozhets 8fb59d3023 Dont set checkout sha for removed branch/tag 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-15 18:30:41 +02:00
Jacob Vosmaer cbeaa57a4a Version 7.12.0.rc1 v7.12.0.rc1 2015-06-12 15:11:59 +02:00
Marin Jankovski cb980c05d0 Merge branch 'update-install-docs' into 'master' 
Update install docs for 7.12

See merge request !1857
 2015-06-12 12:49:32 +00:00
Jacob Vosmaer f04134becd New source installs should use 7-12-stable 
Even though the 7-12-stable branch does not exist yet.
 2015-06-12 14:29:18 +02:00