| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix Preferences feature specrs-custom-dashboard-backport | Robert Speicher | 2015-06-16 | 1 | -10/+8 |
| | | |||||
| * | Fix preferences/show | Robert Speicher | 2015-06-16 | 1 | -5/+6 |
| | | |||||
| * | Fix doc typos | Robert Speicher | 2015-06-16 | 1 | -7/+6 |
| | | | | | cherry-picked | ||||
| * | Add `allowing_for_delay` helper method for feature specs | Robert Speicher | 2015-06-16 | 2 | -6/+41 |
| | | | | | cherry-picked | ||||
| * | Refactor RootController | Robert Speicher | 2015-06-16 | 1 | -2/+12 |
| | | | | | cherry-picked | ||||
| * | Refactor dashboard_choices | Robert Speicher | 2015-06-16 | 2 | -21/+26 |
| | | | | | cherry-picked | ||||
| * | Remove redundant help text from custom dashboard selection | Robert Speicher | 2015-06-16 | 1 | -2/+0 |
| | | | | | cherry-picked | ||||
| * | Fix alignment of Behavior form; add documentation link | Robert Speicher | 2015-06-16 | 1 | -2/+4 |
| | | | | | cherry-picked | ||||
| * | Move 2FA docs from "Workflow" to "Profile Settings" | Robert Speicher | 2015-06-16 | 7 | -20/+20 |
| | | | | | cherry-picked | ||||
| * | Add docs for Profile > Preferences | Robert Speicher | 2015-06-16 | 3 | -35/+72 |
| | | | | | | | Also converts doc/README.md to Unix line endings cherry-picked | ||||
| * | Spec the failure cases for PreferencesController#update | Robert Speicher | 2015-06-16 | 2 | -6/+27 |
| | | | | | cherry-picked | ||||
| * | Make the dashboard choice text match the text in the sidebar | Robert Speicher | 2015-06-16 | 2 | -4/+4 |
| | | | | | cherry-picked | ||||
| * | Add feature specs for default dashboard preference | Robert Speicher | 2015-06-16 | 3 | -10/+54 |
| | | | | | cherry-picked | ||||
| * | Add a form field to customize the dashboard preference | Robert Speicher | 2015-06-16 | 3 | -2/+58 |
| | | | | | cherry-picked | ||||
| * | Account for RootController for dashboard navigation and Dispatch JS | Robert Speicher | 2015-06-16 | 2 | -2/+2 |
| | | | | | cherry-picked | ||||
| * | Add RootController | Robert Speicher | 2015-06-16 | 5 | -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 model | Robert Speicher | 2015-06-16 | 6 | -5/+25 |
| | | | | | cherry-picked | ||||
| * | Simplify the javascript behavior for Preference updating | Robert Speicher | 2015-06-16 | 4 | -15/+19 |
| | | | | | cherry-picked | ||||
| * | Remove js handler from Profiles#update | Robert Speicher | 2015-06-16 | 1 | -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 Preferences | Robert Speicher | 2015-06-16 | 11 | -105/+112 |
| | | | | | cherry-picked | ||||
| * | Add Profiles::PreferencesController | Robert Speicher | 2015-06-16 | 11 | -15/+127 |
| | | | | | cherry-picked | ||||
| * | Version 7.12.0.rc2v7.12.0.rc2 | Jacob Vosmaer | 2015-06-16 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'kerberos_require' into '7-12-stable' | Dmitriy Zaporozhets | 2015-06-16 | 1 | -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_require | Dmitriy Zaporozhets | 2015-06-16 | 1 | -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-stable | Dmitriy Zaporozhets | 2015-06-16 | 4 | -36/+52 |
| |\ \ | |/ | |||||
| | * | Merge branch '7-12-rc2' into '7-12-stable' | Dmitriy Zaporozhets | 2015-06-15 | 5 | -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 file | Dmitriy Zaporozhets | 2015-06-15 | 1 | -25/+37 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | | * | Fix typo on account page. | Nicolas | 2015-06-15 | 1 | -1/+1 |
| | | | | |||||
| | | * | Merge branch 'fix-gitlab-ci-yml' into 'master' | Dmitriy Zaporozhets | 2015-06-15 | 3 | -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/tag | Dmitriy Zaporozhets | 2015-06-15 | 1 | -2/+5 |
| |/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Version 7.12.0.rc1v7.12.0.rc1 | Jacob Vosmaer | 2015-06-12 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'update-install-docs' into 'master' | Marin Jankovski | 2015-06-12 | 1 | -4/+4 |
| |\ | | | | | | | | | | | Update install docs for 7.12 See merge request !1857 | ||||
| | * | New source installs should use 7-12-stable | Jacob Vosmaer | 2015-06-12 | 1 | -2/+2 |
| | | | | | | | | | Even though the 7-12-stable branch does not exist yet. | ||||
| | * | Install git 2.4.3 | Jacob Vosmaer | 2015-06-12 | 1 | -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-ce | Dmitriy Zaporozhets | 2015-06-12 | 70 | -831/+831 |
| |\ | |||||
| | * | Merge branch 'rs-expect-syntax-features' into 'master' | Dmitriy Zaporozhets | 2015-06-12 | 70 | -831/+831 |
| | |\ | | | | | | | | | | | | | | | | Prepare feature steps for RSpec 3 See merge request !803 | ||||
| | | * | Call `page.all` instead of `all` in feature steps | Robert Speicher | 2015-06-12 | 10 | -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 steps | Robert Speicher | 2015-06-12 | 34 | -159/+159 |
| | | | | |||||
| | | * | Update all `should`-style syntax to `expect` in features | Robert Speicher | 2015-06-12 | 69 | -662/+662 |
| | |/ | |||||
| * | | Merge branch 'remove-activity-feed-text' into 'master' | Dmitriy Zaporozhets | 2015-06-12 | 3 | -3/+0 |
| |\ \ | | | | | | | | | | | | | | | | Remove text since rss is now to prominent. See merge request !1855 | ||||
| | * | | Remove text since rss is now to prominent. | Sytse Sijbrandij | 2015-06-12 | 3 | -3/+0 |
| | | | | |||||
| * | | | Merge branch 'rc1-release-doc-link' into 'master' | Job van der Voort | 2015-06-12 | 1 | -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 | ||||
| | * | | Fix link to howto_rc1.md | Jacob Vosmaer | 2015-06-12 | 1 | -1/+1 |
| |/ / | | | | | | | | | The relative link that was there before breaks when you copy-paste the issue template into an actual issue. | ||||
| * | | Merge branch 'note_about_omnibus_changes' into 'master' | Dmitriy Zaporozhets | 2015-06-12 | 8 | -4/+31 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note that changing example configuration files requires changing omnibus-gitlab. Keeping track of changes in these files is not easy and they usually require change in omnibus-gitlab. Added a note so everyone is aware of this. Similar is added to gitlab-shell and gitlab-ci. Discussed in gitlab-org/omnibus-gitlab#605 See merge request !800 | ||||
| | * | | Add a note that changing example configuration files requires changing ↵note_about_omnibus_changes | Marin Jankovski | 2015-06-11 | 8 | -4/+31 |
| | | | | | | | | | | | | | omnibus-gitlab. | ||||
| * | | | Merge branch 'refactor-mr-widget' into 'master' | Dmitriy Zaporozhets | 2015-06-12 | 28 | -299/+306 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor accept merge request widget * make each case a simple view * separate merge request JS from merge request accept widget JS Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !799 | ||||
| | * | | | Fix test for accept merge request | Dmitriy Zaporozhets | 2015-06-12 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | Fix merge request testrefactor-mr-widget | Dmitriy Zaporozhets | 2015-06-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | Fix automerge | Dmitriy Zaporozhets | 2015-06-11 | 2 | -5/+4 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | Improve variables in mr widget | Dmitriy Zaporozhets | 2015-06-11 | 5 | -15/+8 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |