summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
|\ \ \ \ \
| * | | | | Replace some icons in headerheader-iconsDmitriy Zaporozhets2015-05-271-2/+2
* | | | | | Merge branch 'rs-no-killers-in-development' into 'master'Marin Jankovski2015-05-281-4/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Disable Unicorn::WorkerKiller in non-production environmentsrs-no-killers-in-developmentRobert Speicher2015-05-271-4/+7
|/ / / / /
* | | | | Merge branch 'rs-dont-follow-me' into 'master'Douwe Maan2015-05-275-2/+89
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add ExternalLinkFilter to Markdown pipeliners-dont-follow-meRobert Speicher2015-05-275-2/+89
|/ / / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-2718-47/+131
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'browse-milestone-issues' into 'master'Douwe Maan2015-05-2714-46/+116
| |\ \ \
| | * | | Fix spec.browse-milestone-issuesDouwe Maan2015-05-271-2/+2
| | * | | Add Browse Issues button to Dashboard and Group milestones.Douwe Maan2015-05-274-4/+10
| | * | | Fix milestone "Browse Issues" button.Douwe Maan2015-05-273-3/+4
| | * | | Set milestone on new issue when creating issue from index with milestone filt...Douwe Maan2015-05-277-37/+100
| * | | | Merge branch 'fix-disabled-project-snippet-feature' into 'master'Douwe Maan2015-05-274-1/+15
| |\ \ \ \
| | * | | | Fix project snippets button appearing when it is disabledStan Hu2015-05-274-1/+15
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-273-1/+7
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Merge branch 'fix-safari-clone-url' into 'master'Douwe Maan2015-05-272-1/+5
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix clone URL losing selection after a single click in Safari and ChromeStan Hu2015-05-242-1/+5
| * | | | Merge branch 'support-file-attachments-milestones' into 'master'Douwe Maan2015-05-272-0/+2
| |\ \ \ \ | | |_|/ / | |/| | |
View Lorry Controller Status