summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Cache markdown of commentscache-commits-renderDmitriy Zaporozhets2015-06-301-4/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Cache issue in the listDmitriy Zaporozhets2015-06-301-36/+37
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Cache commits listDmitriy Zaporozhets2015-06-301-28/+29
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Re-use event cache with other users unless its personalDmitriy Zaporozhets2015-06-301-10/+11
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'docker-ci' into 'master'Dmitriy Zaporozhets2015-06-301-1/+1
|\ | | | | | | | | | | | | | | Added missing packages required by docker builds This fixes backup failed tests, missing commands: `pg_dump` and `mysqldump`. See merge request !889
| * Added missing packages required by docker buildsKamil Trzcinski2015-06-251-1/+1
| |
* | Merge branch 'fix-c-prototype-highlighting' into 'master'Stan Hu2015-06-303-3/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | Bump rugments to 1.0.0beta8 to fix C prototype function highlighting Closes #1890 See merge request !902
| * | Bump rugments to v1.0.0beta8 to fix C prototype function highlightingStan Hu2015-06-283-3/+4
| | | | | | | | | | | | Closes #1890
* | | Merge branch 'doc-style' into 'master'Dmitriy Zaporozhets2015-06-291-17/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | update documentation styleguide See merge request !904
| * | | update documentation styleguideJob van der Voort2015-06-291-17/+18
|/ / /
* | | Merge branch '1791-fix-github-issue-order' into 'master'Stan Hu2015-06-292-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong order of issues when importing from github ### 1. What does this MR do? The order of issues imported from GitHub is fixed. ### 2. Are there points in the code the reviewer needs to double check? Nothing. ### 3. Why was this MR needed? The default behaviors of GitHub API at listing issues are sort: :created and direction: :desc. See GitHub API details at https://developer.github.com/v3/issues/#list-issues. ### 4. What are the relevant issue numbers / Feature requests? Fixes #1791 ### 5. Screenshots (if relevant) Nothing See merge request !898
| * | | Fix wrong order of issues when importing from githubHiroyuki Sato2015-06-282-1/+4
| |/ / | | | | | | | | | | | | See API details at https://developer.github.com/v3/issues/. Refs #1791
* | | Merge branch 'fix-relative-submodule-namespace-path' into 'master'Dmitriy Zaporozhets2015-06-293-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when relative submodule resolves to a namespace that has a different name from its path ### What does this MR do? This MR fixes a bug in resolving a namespace when the `name` differed from `path`. ### Why was this MR needed? The original code was using `name`, when the proper input to `namespace_project_path` was `path`. ### What are the relevant issue numbers? Closes #1849 See merge request !864
| * | | Fix Error 500 when relative submodule resolves to a namespace that has a ↵Stan Hu2015-06-233-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | different name from its path Closes #1849
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-291-4/+23
|\ \ \ \
| * \ \ \ Merge branch 'add_to_backup_docs' into 'master'Dmitriy Zaporozhets2015-06-291-4/+23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain warnings when using omnibus packages with backup restore Instead of adding this to the omnibus documentation as proposed [here](https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/392), moving to one central place as part of efforts to have central location for the docs. See merge request !903
| | * | | | 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 'link-to-saml' into 'master'Job van der Voort2015-06-291-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to SAML docs from doc index Without this link, the SAML docs are hard to discover. See merge request !1882
| * | | | Link to SAML docs from doc indexJacob Vosmaer2015-06-291-0/+1
|/ / / / | | | | | | | | | | | | Without this link, the SAML docs are hard to discover.
* | | | Merge branch 'rs-fix-subscription-feature' into 'master'Dmitriy Zaporozhets2015-06-292-5/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempt to fix the "I should see that I am [un]subscribed" steps Makes use of Capybara methods that wait. Hopefully this will fix the random timing-related failures of this step. See merge request !853
| * | | | Attempt to fix the "I should see that I am [un]subscribed" stepsrs-fix-subscription-featureRobert Speicher2015-06-252-5/+4
| | |_|/ | |/| | | | | | | | | | | | | | Makes use of Capybara methods that wait. Hopefully this will fix the random timing-related failures of this step.
* | | | Merge branch 'rs-fuubar' into 'master'Dmitriy Zaporozhets2015-06-293-1/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Fuubar as the default RSpec formatter - Shows how many specs have been run, how many remaining - Estimates how long is left - Instantly shows failures - Looks awesome :sparkles: ![Screen_Shot_2015-06-26_at_1.00.47_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/da7c989e04237141d9adb4c4b5898359/Screen_Shot_2015-06-26_at_1.00.47_AM.png) See merge request !893
| * | | | Make Fuubar the default rspec formatterrs-fuubarRobert Speicher2015-06-261-0/+1
| | | | |
| * | | | Add Fuubar gemRobert Speicher2015-06-252-1/+10
| |/ / /
* | | | Merge branch 'rs-disables-submit-behavior' into 'master'Dmitriy Zaporozhets2015-06-2923-55/+131
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "Requires Input" JS behavior This aims to replace all of those `disableButtonIfEmptyField` calls littered throughout views and JS with a simple, clean, markup-based behavior. While going through all of the old usages, I found a few places where the old behavior wasn't actually working, so... bonus, they work now! See merge request !900
| * | | | Remove requires-input from the Network Graph formrs-disables-submit-behaviorRobert Speicher2015-06-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | The "Begin with the selected commit" checkbox requires the submit button to be enabled, even if the extended SHA1 input field is blank.
| * | | | Fix "Project Forked Merge Requests" scenarioRobert Speicher2015-06-261-1/+0
| | | | |
| * | | | Remove duplicate 'required: true' attributeRobert Speicher2015-06-261-1/+1
| | | | |
| * | | | Remove disableButtonIf[Any]EmptyField calls from formsRobert Speicher2015-06-2618-55/+26
| | | | | | | | | | | | | | | | | | | | These have been replaced by the "requiresInput" behavior.
| * | | | Add "Requires Input" JS behaviorRobert Speicher2015-06-263-0/+106
| | |/ / | |/| |
* | | | Merge branch 'rs-update-gitlab-ci' into 'master'Dmitriy Zaporozhets2015-06-292-14/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | Remove jasmine:ci task, execute teaspoon directly on CI See merge request !901
| * | | Remove jasmine:ci task, execute teaspoon directly on CIrs-update-gitlab-ciRobert Speicher2015-06-282-14/+2
|/ / /
* | | 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>