summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use participants from database table instead of parsing all commentsparticipants-tableDmitriy Zaporozhets2015-06-2614-75/+47
* Imrpove participants model and add some basic specsDmitriy Zaporozhets2015-06-264-0/+18
* Create paricipants modelDmitriy Zaporozhets2015-06-262-0/+9
* Create participants tableDmitriy Zaporozhets2015-06-262-1/+20
* Merge branch 'rename-abilities' into 'master'Dmitriy Zaporozhets2015-06-2633-88/+101
|\
| * Refactor issue, mr, note abilities to include project abilities tooDmitriy Zaporozhets2015-06-261-13/+30
| * Change dynamic abilities to new formatDmitriy Zaporozhets2015-06-262-13/+9
| * Update controller filtersDmitriy Zaporozhets2015-06-266-13/+13
| * Rename abilities to correspond contoller/model action namesrename-abilitiesDmitriy Zaporozhets2015-06-2631-53/+53
* | Merge branch 'rs-issue-1887' into 'master'Dmitriy Zaporozhets2015-06-264-28/+27
|\ \
| * | Fix merge request diff featuresrs-issue-1887Robert Speicher2015-06-253-23/+16
| * | Trigger sticky_kit:recalc when diffs are pre-loadedRobert Speicher2015-06-251-3/+9
| * | Reorder MergeRequestTabs constructorRobert Speicher2015-06-251-3/+3
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-2643-247/+203
|\ \ \
| * \ \ Merge branch 'permission-improvements' into 'master'Dmitriy Zaporozhets2015-06-2643-247/+203
| |\ \ \
| | * | | Only people who can manage issue can assign labels to itpermission-improvementsDmitriy Zaporozhets2015-06-261-1/+1
| | * | | Use page.within in testsDmitriy Zaporozhets2015-06-261-3/+3
| | | |/ | | |/|
| | * | Simplify set of assignee, milestone and label to admin_issue ruleDmitriy Zaporozhets2015-06-267-27/+8
| | * | Update tests and use js-issuable class for context formDmitriy Zaporozhets2015-06-268-11/+11
| | * | UsersSelect is part of filter so I rather keep js executed in partialDmitriy Zaporozhets2015-06-252-7/+2
| | * | Write test for submitting issue as guestDmitriy Zaporozhets2015-06-252-0/+30
| | * | Fix js error on merge request pageDmitriy Zaporozhets2015-06-251-1/+0
| | * | Update CHANGELOGDmitriy Zaporozhets2015-06-251-0/+1
| | * | Dont allow set assignee, milestone or labels if user is guestDmitriy Zaporozhets2015-06-255-0/+18
| | * | Move duplicate js functionality into IssuableFormDmitriy Zaporozhets2015-06-252-8/+6
| | * | Refactor issue and merge request sidebarDmitriy Zaporozhets2015-06-2514-161/+89
| | * | Dont allow guest to set assigne, milestone and label when create new issue or...Dmitriy Zaporozhets2015-06-252-37/+43
| | * | Move issuable partials in common directoryDmitriy Zaporozhets2015-06-2512-11/+11
| | |/
* | | Merge branch 'k-github-ee' into 'master'Job van der Voort2015-06-261-1/+3
|\ \ \ | |/ / |/| |
| * | fixed phrasekaren Carias2015-06-251-1/+1
| * | added info about EEkaren Carias2015-06-251-1/+1
| * | added info about GitHub importingkaren Carias2015-06-241-1/+3
* | | Merge branch 'SAML_1888' into 'master'Marin Jankovski2015-06-261-1/+1
|\ \ \ | |_|/ |/| |
| * | Add SAML to list of social_providermatt-firtion/gitlab-ce-SAML_1888Matthew Firtion2015-06-251-1/+1
|/ /
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-252-44/+37
|\ \
| * \ Merge branch 'sidebar-animation' into 'master'Dmitriy Zaporozhets2015-06-252-44/+37
| |\ \
| | * | Have sidebar labels disappear behind content instead of hide immediately.sidebar-animationDouwe Maan2015-06-252-44/+37
| |/ /
* | | Merge branch 'highlight-link-sidebar' into 'master'Dmitriy Zaporozhets2015-06-251-1/+1
|\ \ \ | |/ / |/| |
| * | prettier highlighting of active link in the sidebarJob van der Voort2015-06-251-1/+1
|/ /
* | Merge branch 'rs-random-placeholder-tip' into 'master'Dmitriy Zaporozhets2015-06-254-24/+35
|\ \
| * | Prefix random Markdown tips with "Tip:"rs-random-placeholder-tipRobert Speicher2015-06-242-2/+2
| * | Show a random Markdown tip in the textarea placeholderRobert Speicher2015-06-234-24/+35
* | | Merge branch 'project_icon_removal' into 'master'Dmitriy Zaporozhets2015-06-251-2/+0
|\ \ \
| * | | Removed the icons from the New Issue and New Project buttonsproject_icon_removalDarby2015-06-241-2/+0
| | |/ | |/|
* | | Merge branch 'rs-default-admin-password' into 'master'Dmitriy Zaporozhets2015-06-256-6/+7
|\ \ \
| * | | Add CHANGELOG entry for default password changers-default-admin-passwordRobert Speicher2015-06-241-0/+1
| * | | Change default admin password from "5iveL!fe" to "password"Robert Speicher2015-06-245-6/+6
* | | | Merge branch 'performance-improvements' into 'master'Dmitriy Zaporozhets2015-06-2510-16/+33
|\ \ \ \ | |/ / / |/| | |
| * | | Add CHANGELOG itemperformance-improvementsDmitriy Zaporozhets2015-06-241-0/+1
| * | | Improve performance for merge_request#show pageDmitriy Zaporozhets2015-06-243-6/+9