- 22 Jun, 2015 4 commits
-
-
Jacob Vosmaer authored
-
Dmitriy Zaporozhets authored
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
-
Jacob Vosmaer authored
Disable changing of target branch in new merge request page when a branch has already been specified Closes #1830 See merge request !856
-
Jacob Vosmaer authored
Fix Error 500 when one user attempts to access a personal, internal snippet Closes #1815 See merge request !857
-
- 20 Jun, 2015 2 commits
- 18 Jun, 2015 6 commits
-
-
Jacob Vosmaer authored
-
Jacob Vosmaer authored
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
-
Stan Hu authored
Fix 403 Access Denied error messages when accessing Labels section in a project that has MRs disabled but issues enabled Closes #1813
-
Jacob Vosmaer authored
"Fix behavior of ldap_person method in Gitlab::OAuth::User" for 7.12 See !837 See merge request !840
-
Douwe Maan authored
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
-
Douwe Maan authored
Backport custom dashboard This is a backport of !778 without the `Gitlab::Themes` refactor for the 7.12 branch. See merge request !828
-
- 17 Jun, 2015 2 commits
-
-
Dmitriy Zaporozhets authored
Bump rails to 4.1.11, jquery-rails to 3.1.3 for stable See merge request !832
-
Dmitriy Zaporozhets authored
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
-
- 16 Jun, 2015 25 commits
-
-
Robert Speicher authored
-
Robert Speicher authored
-
Robert Speicher authored
cherry-picked
-
Robert Speicher authored
cherry-picked
-
Robert Speicher authored
cherry-picked
-
Robert Speicher authored
cherry-picked
-
Robert Speicher authored
cherry-picked
-
Robert Speicher authored
cherry-picked
-
Robert Speicher authored
cherry-picked
-
Robert Speicher authored
Also converts doc/README.md to Unix line endings cherry-picked
-
Robert Speicher authored
cherry-picked
-
Robert Speicher authored
cherry-picked
-
Robert Speicher authored
cherry-picked
-
Robert Speicher authored
cherry-picked
-
Robert Speicher authored
cherry-picked
-
Robert Speicher authored
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
-
Robert Speicher authored
cherry-picked
-
Robert Speicher authored
cherry-picked
-
Robert Speicher authored
It was only used for the appearance live updating, which is now handled by Profiles::Preferences#update cherry-picked
-
Robert Speicher authored
cherry-picked
-
Robert Speicher authored
cherry-picked
-
Jacob Vosmaer authored
-
Dmitriy Zaporozhets authored
Kerberos require to stable 7.12 !819 to 7-12-stable cc @jacobvosmaer See merge request !827
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
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
-
- 15 Jun, 2015 1 commit
-
-
Dmitriy Zaporozhets authored
Fixes for RC2 we need it to make GitLab works with new CI cc @jacobvosmaer See merge request !1864
-