summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Version 7.12.0.rc3v7.12.0.rc3Jacob Vosmaer2015-06-181-1/+1
|
* Merge branch 'labels-permission-fix-7-12' into '7-12-stable'Jacob Vosmaer2015-06-184-7/+43
|\ | | | | | | | | | | | | | | | | | | 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
| * Fix 403 Access Denied error messages when accessing Labels section in a ↵Stan Hu2015-06-184-7/+43
|/ | | | | | project that has MRs disabled but issues enabled Closes #1813
* Merge branch 'ldap-person-fix-7-12' into '7-12-stable'Jacob Vosmaer2015-06-182-50/+61
|\ | | | | | | | | | | | | | | "Fix behavior of ldap_person method in Gitlab::OAuth::User" for 7.12 See !837 See merge request !840
| * Merge branch 'fix/oauth_user_ldap_person' into 'master'ldap-person-fix-7-12Douwe Maan2015-06-182-50/+61
|/ | | | | | | | | | | 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
* Merge branch 'rs-custom-dashboard-backport' into '7-12-stable'Douwe Maan2015-06-1834-132/+536
|\ | | | | | | | | | | | | | | Backport custom dashboard This is a backport of !778 without the `Gitlab::Themes` refactor for the 7.12 branch. See merge request !828
| * Fix Preferences feature specrs-custom-dashboard-backportRobert Speicher2015-06-161-10/+8
| |
| * Fix preferences/showRobert Speicher2015-06-161-5/+6
| |
| * Fix doc typosRobert Speicher2015-06-161-7/+6
| | | | | | | | cherry-picked
| * Add `allowing_for_delay` helper method for feature specsRobert Speicher2015-06-162-6/+41
| | | | | | | | cherry-picked
| * Refactor RootControllerRobert Speicher2015-06-161-2/+12
| | | | | | | | cherry-picked
| * Refactor dashboard_choicesRobert Speicher2015-06-162-21/+26
| | | | | | | | cherry-picked
| * Remove redundant help text from custom dashboard selectionRobert Speicher2015-06-161-2/+0
| | | | | | | | cherry-picked
| * Fix alignment of Behavior form; add documentation linkRobert Speicher2015-06-161-2/+4
| | | | | | | | cherry-picked
| * Move 2FA docs from "Workflow" to "Profile Settings"Robert Speicher2015-06-167-20/+20
| | | | | | | | cherry-picked
| * Add docs for Profile > PreferencesRobert Speicher2015-06-163-35/+72
| | | | | | | | | | | | Also converts doc/README.md to Unix line endings cherry-picked
| * Spec the failure cases for PreferencesController#updateRobert Speicher2015-06-162-6/+27
| | | | | | | | cherry-picked
| * Make the dashboard choice text match the text in the sidebarRobert Speicher2015-06-162-4/+4
| | | | | | | | cherry-picked
| * Add feature specs for default dashboard preferenceRobert Speicher2015-06-163-10/+54
| | | | | | | | cherry-picked
| * Add a form field to customize the dashboard preferenceRobert Speicher2015-06-163-2/+58
| | | | | | | | cherry-picked
| * Account for RootController for dashboard navigation and Dispatch JSRobert Speicher2015-06-162-2/+2
| | | | | | | | cherry-picked
| * Add RootControllerRobert Speicher2015-06-165-4/+60
| | | | | | | | | | | | | | | | 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
| * Add `dashboard` attribute to User modelRobert Speicher2015-06-166-5/+25
| | | | | | | | cherry-picked
| * Simplify the javascript behavior for Preference updatingRobert Speicher2015-06-164-15/+19
| | | | | | | | cherry-picked
| * Remove js handler from Profiles#updateRobert Speicher2015-06-161-1/+0
| | | | | | | | | | | | | | It was only used for the appearance live updating, which is now handled by Profiles::Preferences#update cherry-picked
| * Move the "Design" templates and logic to PreferencesRobert Speicher2015-06-1611-105/+112
| | | | | | | | cherry-picked
| * Add Profiles::PreferencesControllerRobert Speicher2015-06-1611-15/+127
| | | | | | | | cherry-picked
* | Merge branch 'bump-gems' into '7-12-stable'Dmitriy Zaporozhets2015-06-172-34/+37
|\ \ | |/ |/| | | | | | | Bump rails to 4.1.11, jquery-rails to 3.1.3 for stable See merge request !832
| * Merge branch 'rs-rails-update' into 'master'bump-gemsDmitriy Zaporozhets2015-06-172-34/+37
|/ | | | | | | | | | 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
* Version 7.12.0.rc2v7.12.0.rc2Jacob Vosmaer2015-06-161-1/+1
|
* Merge branch 'kerberos_require' into '7-12-stable'Dmitriy Zaporozhets2015-06-161-0/+8
|\ | | | | | | | | | | | | | | | | | | Kerberos require to stable 7.12 !819 to 7-12-stable cc @jacobvosmaer See merge request !827
| * Merge branch 'require_kerberos_when_enabled' into 'master'kerberos_requireDmitriy Zaporozhets2015-06-161-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch '7-12-stable' of dev.gitlab.org:gitlab/gitlabhq into 7-12-stableDmitriy Zaporozhets2015-06-164-36/+52
|\ \ | |/
| * Merge branch '7-12-rc2' into '7-12-stable'Dmitriy Zaporozhets2015-06-155-38/+57
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes for RC2 we need it to make GitLab works with new CI cc @jacobvosmaer See merge request !1864
| | * Fix .gitlab-ci.yml fileDmitriy Zaporozhets2015-06-151-25/+37
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Fix typo on account page.Nicolas2015-06-151-1/+1
| | |
| | * Merge branch 'fix-gitlab-ci-yml' into 'master'Dmitriy Zaporozhets2015-06-153-12/+19
| |/ | | | | | | | | | | | | | | | | | | 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
* | Dont set checkout sha for removed branch/tagDmitriy Zaporozhets2015-06-151-2/+5
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Version 7.12.0.rc1v7.12.0.rc1Jacob Vosmaer2015-06-121-1/+1
|
* Merge branch 'update-install-docs' into 'master'Marin Jankovski2015-06-121-4/+4
|\ | | | | | | | | | | Update install docs for 7.12 See merge request !1857
| * New source installs should use 7-12-stableJacob Vosmaer2015-06-121-2/+2
| | | | | | | | Even though the 7-12-stable branch does not exist yet.
| * Install git 2.4.3Jacob Vosmaer2015-06-121-2/+2
|/ | | | | | Git 2.1.2 does not protect against pushes trying the '.Git/config' attack (CVE-2014-9390). Going to 2.4.3 is perhaps a big jump but why not use the latest? (Famous last words.)
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-1270-831/+831
|\
| * Merge branch 'rs-expect-syntax-features' into 'master'Dmitriy Zaporozhets2015-06-1270-831/+831
| |\ | | | | | | | | | | | | | | | Prepare feature steps for RSpec 3 See merge request !803
| | * Call `page.all` instead of `all` in feature stepsRobert Speicher2015-06-1210-12/+12
| | | | | | | | | | | | | | | | | | | | | There's a naming conflict between Capybara and rspec-matchers which both define the `all` method. See https://github.com/jnicklas/capybara/issues/1396
| | * Change `within` to `page.within` in feature stepsRobert Speicher2015-06-1234-159/+159
| | |
| | * Update all `should`-style syntax to `expect` in featuresRobert Speicher2015-06-1269-662/+662
| |/
* | Merge branch 'remove-activity-feed-text' into 'master'Dmitriy Zaporozhets2015-06-123-3/+0
|\ \ | | | | | | | | | | | | | | | Remove text since rss is now to prominent. See merge request !1855
| * | Remove text since rss is now to prominent.Sytse Sijbrandij2015-06-123-3/+0
| | |
* | | Merge branch 'rc1-release-doc-link' into 'master'Job van der Voort2015-06-121-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | Fix link to howto_rc1.md The relative link that was there before breaks when you copy-paste the issue template into an actual issue. See merge request !1856
View Lorry Controller Status