summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Correctly show anonymous authorized applications under Profile > Applications.anonymous-applications-7-12Douwe Maan2015-07-024-4/+24
* Merge branch 'SAML_1888' into 'master'saml_social_providerMarin Jankovski2015-06-261-1/+1
* Fix error when deleting a user who has projectsStan Hu2015-06-233-2/+8
* Merge branch 'ext-issue-7-12' into '7-12-stable'Jacob Vosmaer2015-06-221-1/+3
|\
| * Fix hooks for web based events with external issue referencesext-issue-7-12Daniel Gerhardt2015-06-161-1/+3
* | Merge branch 'rename-mr-tabs' into '7-12-stable'Jacob Vosmaer2015-06-2211-35/+35
|\ \
| * | Fix closed merge request scope at milestone pageDmitriy Zaporozhets2015-06-221-1/+1
| * | Revert merge request states renamingDmitriy Zaporozhets2015-06-2211-34/+34
* | | Merge branch '7-12-fix-post-receive-external-tracker' into '7-12-stable'Jacob Vosmaer2015-06-222-11/+17
|\ \ \ | |/ / |/| |
| * | Fix post-receive errors on a push when an external issue tracker is configuredStan Hu2015-06-202-11/+17
* | | Merge branch '7-12-stable' of dev.gitlab.org:gitlab/gitlabhq into 7-12-stableJacob Vosmaer2015-06-221-1/+6
|\ \ \
| * | | Merge branch 'web-editor-autocrlf' into 'master'Dmitriy Zaporozhets2015-06-221-1/+6
| |/ /
* | | Merge branch '7-12-new-mr-disable-change-target-branch' into '7-12-stable'Jacob Vosmaer2015-06-221-6/+7
|\ \ \
| * | | Disable changing of target branch in new merge request page when a branch has...Stan Hu2015-06-201-6/+7
| |/ /
* | | Fix Error 500 when one user attempts to access a personal, internal snippetStan Hu2015-06-201-1/+1
|/ /
* | Fix 403 Access Denied error messages when accessing Labels section in a proje...Stan Hu2015-06-183-7/+3
* | Fix preferences/showRobert Speicher2015-06-161-5/+6
* | Refactor RootControllerRobert Speicher2015-06-161-2/+12
* | Refactor dashboard_choicesRobert Speicher2015-06-161-13/+16
* | Remove redundant help text from custom dashboard selectionRobert Speicher2015-06-161-2/+0
* | Fix alignment of Behavior form; add documentation linkRobert Speicher2015-06-161-2/+4
* | Spec the failure cases for PreferencesController#updateRobert Speicher2015-06-161-4/+9
* | Make the dashboard choice text match the text in the sidebarRobert Speicher2015-06-161-2/+2
* | Add feature specs for default dashboard preferenceRobert Speicher2015-06-162-1/+6
* | Add a form field to customize the dashboard preferenceRobert Speicher2015-06-162-2/+38
* | Account for RootController for dashboard navigation and Dispatch JSRobert Speicher2015-06-162-2/+2
* | Add RootControllerRobert Speicher2015-06-162-1/+19
* | Add `dashboard` attribute to User modelRobert Speicher2015-06-162-1/+7
* | Simplify the javascript behavior for Preference updatingRobert Speicher2015-06-163-14/+10
* | Remove js handler from Profiles#updateRobert Speicher2015-06-161-1/+0
* | Move the "Design" templates and logic to PreferencesRobert Speicher2015-06-167-70/+79
* | Add Profiles::PreferencesControllerRobert Speicher2015-06-164-3/+35
* | Fix typo on account page.Nicolas2015-06-151-1/+1
* | Merge branch 'fix-gitlab-ci-yml' into 'master'Dmitriy Zaporozhets2015-06-151-9/+13
|/
* Merge branch 'remove-activity-feed-text' into 'master'Dmitriy Zaporozhets2015-06-123-3/+0
|\
| * Remove text since rss is now to prominent.Sytse Sijbrandij2015-06-123-3/+0
* | Merge branch 'refactor-mr-widget' into 'master'Dmitriy Zaporozhets2015-06-1227-298/+304
|\ \
| * | Fix automergeDmitriy Zaporozhets2015-06-112-5/+4
| * | Improve variables in mr widgetDmitriy Zaporozhets2015-06-115-15/+8
| * | Fix rubocopDmitriy Zaporozhets2015-06-111-2/+1
| * | Extract merge request widget JS to separate classDmitriy Zaporozhets2015-06-1111-87/+96
| * | Refactor merge request widget step 2Dmitriy Zaporozhets2015-06-1117-75/+60
| * | Refactor accept merge request widgetDmitriy Zaporozhets2015-06-1123-191/+212
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-123-4/+5
|\ \ \
| * \ \ Merge branch 'fix-graph-width' into 'master'Dmitriy Zaporozhets2015-06-121-2/+2
| |\ \ \
| | * | | Fix graph width on different screen sizesfix-graph-widthDmitriy Zaporozhets2015-06-111-2/+2
| | |/ /
| * | | Merge branch 'fluid-commit-calendar' into 'master'Dmitriy Zaporozhets2015-06-121-0/+1
| |\ \ \
| | * | | Make commit calendar size depend on window sizefluid-commit-calendarDmitriy Zaporozhets2015-06-111-0/+1
| | |/ /
| * | | Merge branch 'rs-issue-1757' into 'master'Dmitriy Zaporozhets2015-06-111-2/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Add negative tabindex to Markdown Write and Preview tabsrs-issue-1757Robert Speicher2015-06-101-2/+2
| | |/