summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add option to disallow users from registering any application to use GitLab a...user-oauth-applicationsDouwe Maan2015-05-299-29/+63
* Merge branch 'feature/saml_support' into 'master'Douwe Maan2015-05-297-0/+104
|\
| * Add SAML support via OmniauthAlex Lossent2015-05-277-0/+104
* | Merge branch 'rs-merge-request-tabs-the-third' into 'master'Dmitriy Zaporozhets2015-05-291-0/+3
|\ \
| * | Include location.search and location.hash in URL for replaceStateRobert Speicher2015-05-291-0/+3
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-2923-547/+313
|\ \ \
| * \ \ Merge branch 'rs-teaspoon' into 'master'Dmitriy Zaporozhets2015-05-2923-547/+313
| |\ \ \ | | |/ / | |/| |
| | * | Disable Rack::MiniProfiler for /teaspoon pathrs-teaspoonRobert Speicher2015-05-281-1/+2
| | * | Update jasmine:ci task to use teaspoonRobert Speicher2015-05-281-1/+1
| | * | Stub ajax in JS specsRobert Speicher2015-05-282-2/+5
| | * | Remove jasmine-fixture, use teaspoon fixturesRobert Speicher2015-05-289-491/+64
| | * | Javascripts don't need to require jquery or bootstrap explicitlyRobert Speicher2015-05-285-8/+1
| | * | teaspoon installRobert Speicher2015-05-282-0/+224
| | * | Remove jasmine-rails; add teaspoonRobert Speicher2015-05-286-46/+18
* | | | Fix diff header with submodule changeDmitriy Zaporozhets2015-05-291-2/+3
|/ / /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-299-60/+97
|\ \ \
| * \ \ Merge branch 'rs-persist-tab-selection-more-betterer' into 'master'Dmitriy Zaporozhets2015-05-298-59/+96
| |\ \ \
| | * | | Improve MergeRequest tab-persisting behaviorrs-persist-tab-selection-more-bettererRobert Speicher2015-05-293-35/+56
| | * | | Add MergeRequests#commits action and routeRobert Speicher2015-05-293-17/+33
| | * | | Bump turbolinks versionRobert Speicher2015-05-292-7/+7
| | |/ /
| * | | Merge branch 'master' into 'master'Robert Speicher2015-05-291-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Remove extra braceMike Butsko2015-05-281-1/+1
| |/ /
* | | Merge pull request #9318 from jvanbaarsen/allow-special-chars-bioDmitriy Zaporozhets2015-05-293-12/+17
|\ \ \ | |/ / |/| |
| * | Allow special characters in users bioJeroen van Baarsen2015-05-283-12/+17
* | | Merge branch 'nicer-acccount-page' into 'master'Dmitriy Zaporozhets2015-05-282-14/+14
|\ \ \
| * | | Make user settings account page nicerDmitriy Zaporozhets2015-05-282-14/+14
|/ / /
* | | Merge branch 'project-aside' into 'master'Dmitriy Zaporozhets2015-05-282-79/+77
|\ \ \
| * | | Use panels instead of well for widgets in project sidebarDmitriy Zaporozhets2015-05-282-79/+77
|/ / /
* | | Merge branch 'profile-settings'Dmitriy Zaporozhets2015-05-2811-110/+129
|\ \ \
| * | | Fix profile tests after header renameDmitriy Zaporozhets2015-05-282-2/+2
| * | | Prefer panels over fieldset when different formsDmitriy Zaporozhets2015-05-283-83/+92
| * | | Consistent header look for setting pagesDmitriy Zaporozhets2015-05-283-14/+24
| * | | Re-organize profile settings titles and headersDmitriy Zaporozhets2015-05-288-10/+11
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-2815-42/+112
|\ \ \ \
| * \ \ \ Merge branch 'user-destroy-wo-groups' into 'master'Dmitriy Zaporozhets2015-05-2810-33/+69
| |\ \ \ \
| | * | | | Fix current user removaluser-destroy-wo-groupsDmitriy Zaporozhets2015-05-281-1/+1
| | * | | | Add CHANGELOG itemDmitriy Zaporozhets2015-05-281-0/+1
| | * | | | You can not remove user if he/she is an only owner of groupDmitriy Zaporozhets2015-05-289-33/+68
| * | | | | Merge branch 'fix-git-blame-syntax-highlighting' into 'master'Douwe Maan2015-05-286-9/+43
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Fix git blame syntax highlighting when different commits break up linesStan Hu2015-05-276-9/+43
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-281-3/+15
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #9335 from stefan-it/documentation/timezone-clarificationsJeroen van Baarsen2015-05-281-3/+15
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Adds new section for changing time zone in GitLab configuration file. New sec...Stefan Schweter2015-05-271-3/+15
* | | | | | | Merge branch 'chlg-update' into 'master'Marin Jankovski2015-05-281-7/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | update changelog for 7.11.4Job van der Voort2015-05-281-7/+14
|/ / / / / /
* | | | | | Merge pull request #9184 from rumpelsepp/englishJeroen van Baarsen2015-05-281-17/+18
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Some language improvementsStefan Tatschner2015-05-271-17/+18
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs-persist-tab-selection' into 'master'Dmitriy Zaporozhets2015-05-284-59/+100
|\ \ \ \ \
| * | | | | Persist current merge request tab selection via URLrs-persist-tab-selectionRobert Speicher2015-05-274-59/+100
* | | | | | Merge branch 'header-icons' into 'master'Dmitriy Zaporozhets2015-05-281-2/+2
|\ \ \ \ \ \