Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add option to disallow users from registering any application to use GitLab a...user-oauth-applications | Douwe Maan | 2015-05-29 | 9 | -29/+63 |
* | Merge branch 'feature/saml_support' into 'master' | Douwe Maan | 2015-05-29 | 7 | -0/+104 |
|\ | |||||
| * | Add SAML support via Omniauth | Alex Lossent | 2015-05-27 | 7 | -0/+104 |
* | | Merge branch 'rs-merge-request-tabs-the-third' into 'master' | Dmitriy Zaporozhets | 2015-05-29 | 1 | -0/+3 |
|\ \ | |||||
| * | | Include location.search and location.hash in URL for replaceState | Robert Speicher | 2015-05-29 | 1 | -0/+3 |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-05-29 | 23 | -547/+313 |
|\ \ \ | |||||
| * \ \ | Merge branch 'rs-teaspoon' into 'master' | Dmitriy Zaporozhets | 2015-05-29 | 23 | -547/+313 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Disable Rack::MiniProfiler for /teaspoon pathrs-teaspoon | Robert Speicher | 2015-05-28 | 1 | -1/+2 |
| | * | | Update jasmine:ci task to use teaspoon | Robert Speicher | 2015-05-28 | 1 | -1/+1 |
| | * | | Stub ajax in JS specs | Robert Speicher | 2015-05-28 | 2 | -2/+5 |
| | * | | Remove jasmine-fixture, use teaspoon fixtures | Robert Speicher | 2015-05-28 | 9 | -491/+64 |
| | * | | Javascripts don't need to require jquery or bootstrap explicitly | Robert Speicher | 2015-05-28 | 5 | -8/+1 |
| | * | | teaspoon install | Robert Speicher | 2015-05-28 | 2 | -0/+224 |
| | * | | Remove jasmine-rails; add teaspoon | Robert Speicher | 2015-05-28 | 6 | -46/+18 |
* | | | | Fix diff header with submodule change | Dmitriy Zaporozhets | 2015-05-29 | 1 | -2/+3 |
|/ / / | |||||
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-05-29 | 9 | -60/+97 |
|\ \ \ | |||||
| * \ \ | Merge branch 'rs-persist-tab-selection-more-betterer' into 'master' | Dmitriy Zaporozhets | 2015-05-29 | 8 | -59/+96 |
| |\ \ \ | |||||
| | * | | | Improve MergeRequest tab-persisting behaviorrs-persist-tab-selection-more-betterer | Robert Speicher | 2015-05-29 | 3 | -35/+56 |
| | * | | | Add MergeRequests#commits action and route | Robert Speicher | 2015-05-29 | 3 | -17/+33 |
| | * | | | Bump turbolinks version | Robert Speicher | 2015-05-29 | 2 | -7/+7 |
| | |/ / | |||||
| * | | | Merge branch 'master' into 'master' | Robert Speicher | 2015-05-29 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Remove extra brace | Mike Butsko | 2015-05-28 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #9318 from jvanbaarsen/allow-special-chars-bio | Dmitriy Zaporozhets | 2015-05-29 | 3 | -12/+17 |
|\ \ \ | |/ / |/| | | |||||
| * | | Allow special characters in users bio | Jeroen van Baarsen | 2015-05-28 | 3 | -12/+17 |
* | | | Merge branch 'nicer-acccount-page' into 'master' | Dmitriy Zaporozhets | 2015-05-28 | 2 | -14/+14 |
|\ \ \ | |||||
| * | | | Make user settings account page nicer | Dmitriy Zaporozhets | 2015-05-28 | 2 | -14/+14 |
|/ / / | |||||
* | | | Merge branch 'project-aside' into 'master' | Dmitriy Zaporozhets | 2015-05-28 | 2 | -79/+77 |
|\ \ \ | |||||
| * | | | Use panels instead of well for widgets in project sidebar | Dmitriy Zaporozhets | 2015-05-28 | 2 | -79/+77 |
|/ / / | |||||
* | | | Merge branch 'profile-settings' | Dmitriy Zaporozhets | 2015-05-28 | 11 | -110/+129 |
|\ \ \ | |||||
| * | | | Fix profile tests after header rename | Dmitriy Zaporozhets | 2015-05-28 | 2 | -2/+2 |
| * | | | Prefer panels over fieldset when different forms | Dmitriy Zaporozhets | 2015-05-28 | 3 | -83/+92 |
| * | | | Consistent header look for setting pages | Dmitriy Zaporozhets | 2015-05-28 | 3 | -14/+24 |
| * | | | Re-organize profile settings titles and headers | Dmitriy Zaporozhets | 2015-05-28 | 8 | -10/+11 |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-05-28 | 15 | -42/+112 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'user-destroy-wo-groups' into 'master' | Dmitriy Zaporozhets | 2015-05-28 | 10 | -33/+69 |
| |\ \ \ \ | |||||
| | * | | | | Fix current user removaluser-destroy-wo-groups | Dmitriy Zaporozhets | 2015-05-28 | 1 | -1/+1 |
| | * | | | | Add CHANGELOG item | Dmitriy Zaporozhets | 2015-05-28 | 1 | -0/+1 |
| | * | | | | You can not remove user if he/she is an only owner of group | Dmitriy Zaporozhets | 2015-05-28 | 9 | -33/+68 |
| * | | | | | Merge branch 'fix-git-blame-syntax-highlighting' into 'master' | Douwe Maan | 2015-05-28 | 6 | -9/+43 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Fix git blame syntax highlighting when different commits break up lines | Stan Hu | 2015-05-27 | 6 | -9/+43 |
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-05-28 | 1 | -3/+15 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge pull request #9335 from stefan-it/documentation/timezone-clarifications | Jeroen van Baarsen | 2015-05-28 | 1 | -3/+15 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Adds new section for changing time zone in GitLab configuration file. New sec... | Stefan Schweter | 2015-05-27 | 1 | -3/+15 |
* | | | | | | | Merge branch 'chlg-update' into 'master' | Marin Jankovski | 2015-05-28 | 1 | -7/+14 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | update changelog for 7.11.4 | Job van der Voort | 2015-05-28 | 1 | -7/+14 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #9184 from rumpelsepp/english | Jeroen van Baarsen | 2015-05-28 | 1 | -17/+18 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Some language improvements | Stefan Tatschner | 2015-05-27 | 1 | -17/+18 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'rs-persist-tab-selection' into 'master' | Dmitriy Zaporozhets | 2015-05-28 | 4 | -59/+100 |
|\ \ \ \ \ | |||||
| * | | | | | Persist current merge request tab selection via URLrs-persist-tab-selection | Robert Speicher | 2015-05-27 | 4 | -59/+100 |
* | | | | | | Merge branch 'header-icons' into 'master' | Dmitriy Zaporozhets | 2015-05-28 | 1 | -2/+2 |
|\ \ \ \ \ \ |