summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add a troubleshooting section for backup restore docs, explain about ↵add_to_backup_docsMarin Jankovski2015-06-291-4/+23
| | | | warnings when using omnibus packages.
* Merge branch 'rename-abilities' into 'master'Dmitriy Zaporozhets2015-06-2633-88/+101
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename abilities to correspond contoller/model action names write_ was renamed to create_ modify_ was renamed to update_ So now in update action we have next code ``` def create can?(current_user, :create_issue, @issue) end def update can?(current_user, :update_issue, @issue) end ``` See merge request !896
| * Refactor issue, mr, note abilities to include project abilities tooDmitriy Zaporozhets2015-06-261-13/+30
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Change dynamic abilities to new formatDmitriy Zaporozhets2015-06-262-13/+9
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Update controller filtersDmitriy Zaporozhets2015-06-266-13/+13
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Rename abilities to correspond contoller/model action namesrename-abilitiesDmitriy Zaporozhets2015-06-2631-53/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | write_ was renamed to create_ modify_ was renamed to update_ So now in update action we have next code def create can?(current_user, :create_issue, @issue) end def update can?(current_user, :update_issue, @issue) end Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'rs-issue-1887' into 'master'Dmitriy Zaporozhets2015-06-264-28/+27
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorder MergeRequestTabs constructor The tab was being activated before we set the `[commits|diffs]Loaded` variable, so even when the `/diffs` route is accessed directly, like from the "Side-by-side" link, the tab was being loaded from its default source. Fixes #1887 See merge request !892
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | The tab was being activated before we set the `[commits|diffs]Loaded` variable, so even when the `/diffs` route is accessed directly, like from the "Side-by-side" link, the tab was being loaded from its default source. Fixes #1887
* | | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update permissions for issue tracker management Don't allow guest or reporter to set assignee, milestone and label when create or update new issue and merge request. After this change `Guest` and `Reporter` rule is used to report issues but only `Developer` and higher roles can manage issues (schedule milestone, assign to user or close any issue) Also I removed some duplication code between issues and merge requests and put all issuable partials in one directory See merge request !890
| | * | | Only people who can manage issue can assign labels to itpermission-improvementsDmitriy Zaporozhets2015-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Use page.within in testsDmitriy Zaporozhets2015-06-261-3/+3
| | | |/ | | |/| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Simplify set of assignee, milestone and label to admin_issue ruleDmitriy Zaporozhets2015-06-267-27/+8
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Update tests and use js-issuable class for context formDmitriy Zaporozhets2015-06-268-11/+11
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | UsersSelect is part of filter so I rather keep js executed in partialDmitriy Zaporozhets2015-06-252-7/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Write test for submitting issue as guestDmitriy Zaporozhets2015-06-252-0/+30
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Fix js error on merge request pageDmitriy Zaporozhets2015-06-251-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Update CHANGELOGDmitriy Zaporozhets2015-06-251-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Dont allow set assignee, milestone or labels if user is guestDmitriy Zaporozhets2015-06-255-0/+18
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Move duplicate js functionality into IssuableFormDmitriy Zaporozhets2015-06-252-8/+6
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Refactor issue and merge request sidebarDmitriy Zaporozhets2015-06-2514-161/+89
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Dont allow guest to set assigne, milestone and label when create new issue ↵Dmitriy Zaporozhets2015-06-252-37/+43
| | | | | | | | | | | | | | | | | | | | | | | | or merge request Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Move issuable partials in common directoryDmitriy Zaporozhets2015-06-2512-11/+11
| | |/ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'k-github-ee' into 'master'Job van der Voort2015-06-261-1/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | added info about GitHub importing Added info that importing doc also works for GitHub EE. https://dev.gitlab.org/gitlab/gitlabhq/issues/2410#note_49396 See merge request !1878
| * | 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_provider Resolves issue 1888. Still an issue because the SAML link under Connected Accounts will not have a logo. See merge request !891
| * | 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 when collapsing. I'm not sure how to make a gif out of it, but I promise it looks pretty :) See merge request !888
| | * | 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 sidebar Before: ![Screenshot_2015-06-25_11.17.08](https://dev.gitlab.org/gitlab/gitlabhq/uploads/851606a122c1d1174d0f97857ad472d3/Screenshot_2015-06-25_11.17.08.png) After: ![Screenshot_2015-06-25_11.17.42](https://dev.gitlab.org/gitlab/gitlabhq/uploads/b8dc55bcd76dac29652ef5d25f99ccff/Screenshot_2015-06-25_11.17.42.png) Only with this theme it's not an improvement (this is an honest merge request (trademark pending)) : ![Screenshot_2015-06-25_11.18.35](https://dev.gitlab.org/gitlab/gitlabhq/uploads/5d631a11ee866f5fc51e985b02a836ba/Screenshot_2015-06-25_11.18.35.png) See merge request !1879
| * | 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
|\ \ | | | | | | | | | | | | | | | | | | | | | Show a random Markdown tip in the textarea placeholder cc @darby See merge request !879
| * | 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 buttons Fixes #1869 No more icons! See merge request !885
| * | | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default admin password Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2422 See merge request !865
| * | | 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
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance improvements * store @participants in variable * store result of subscribed? call into variable In total it reduce amount of SQL queries for issue or merge_request with 10 comments/participants almost twice. See merge request !883
| * | | Add CHANGELOG itemperformance-improvementsDmitriy Zaporozhets2015-06-241-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Improve performance for merge_request#show pageDmitriy Zaporozhets2015-06-243-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * store @participants in variable * store result of subscribed? call into variable In total it reduce amount of SQL queries for merge_request with 10 comments/participants twice. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Improve performance for issue#show pageDmitriy Zaporozhets2015-06-244-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * store @participants in variable * store result of subscribed? call into variable In total it reduce amount of SQL queries for issue with 10 comments/participants twice. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Enable rack profiler by defaultDmitriy Zaporozhets2015-06-242-1/+10
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'add-2fa-status-to-admin-api' into 'master'Robert Speicher2015-06-244-2/+7
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Add 2FA status to user admin API This MR adds the `two_factor_enabled` field to the admin's API to indicate whether a given user has enabled 2FA. See merge request !881