Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Prevent new / renamed project from using a repository path that already ↵ | Gabriel Mazetto | 2017-08-28 | 1 | -3/+1 |
| | | | | | | | | | | exists on disk There are some redundancies in the validation steps, and that is to preserve current error messages behavior Also few specs have to be changed in order to fix madness in validation logic. | ||||
* | Merge branch 'split-events-into-push-events' into 'master' | Sean McGivern | 2017-08-16 | 1 | -22/+8 |
| | | | | | Use a separate table for storing push events See merge request !12463 | ||||
* | Merge branch ↵ | Clement Ho | 2017-08-15 | 2 | -8/+2 |
| | | | | | | | | | '34527-make-edit-comment-button-always-available-outside-of-dropdown' into 'master' Resolve "Make edit comment button always available outside of dropdown" Closes #34527 See merge request !12931 | ||||
* | Revert "Merge branch 'split-events-into-push-events' into 'master'" | Jose Ivan Vargas | 2017-08-11 | 1 | -8/+22 |
| | | | | | This reverts commit e80a893ff0ea8466099f6478183631af55933db2, reversing changes made to 9c11894a656603c59c03d8f35fbe8cdf7a1ad0c4. | ||||
* | Merge branch 'split-events-into-push-events' into 'master' | Sean McGivern | 2017-08-11 | 1 | -22/+8 |
| | | | | | Use a separate table for storing push events See merge request !12463 | ||||
* | Merge branch 'wiki_title' into 'master' | Robert Speicher | 2017-08-07 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | add feature rename wiki title Closes #27800 See merge request !10069 | ||||
| * | Allow wiki pages to be renamed in the UI | wendy0402 | 2017-08-03 | 1 | -1/+1 |
| | | |||||
* | | Merge branch '34060-simplified-general-project-settings' into 'master' | Mike Greiling | 2017-08-04 | 2 | -5/+13 |
|\ \ | | | | | | | | | | | | | | | | | | | 34060 Simply general project settings to use expanded panels Closes #34060 See merge request !12620 | ||||
| * | | fixed up specs | Phil Hughes | 2017-07-28 | 2 | -5/+13 |
| | | | |||||
* | | | Change all `:empty_project` to `:project`rs-empty_project-default | Robert Speicher | 2017-08-02 | 8 | -14/+14 |
| | | | |||||
* | | | Use `:empty_project` where possible in features/steps | Robert Speicher | 2017-08-02 | 2 | -2/+2 |
| |/ |/| | |||||
* | | Rename many path_with_namespace -> full_path | Gabriel Mazetto | 2017-08-01 | 3 | -9/+9 |
|/ | |||||
* | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master' | Robert Speicher | 2017-07-27 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Prevent concurrent editing wiki Closes #1827 See merge request !9707 | ||||
| * | Fix error of spinach test | Hiroyuki Sato | 2017-07-23 | 1 | -1/+1 |
| | | |||||
* | | Remove project_key from the Jira configuration | Jarka Kadlecova | 2017-07-25 | 1 | -1/+0 |
| | | |||||
* | | Resolve "Lazy load images on the Frontend" | Tim Zallmann | 2017-07-24 | 1 | -1/+1 |
|/ | |||||
* | Port spinach tests to rspec feature specszj-pipeline-badge-improvements | Z.J. van de Weg | 2017-07-21 | 2 | -59/+0 |
| | | | | | | | Logic is the same, just now ported, while this feature was being improved anyway in this branch. Resolves #20961 | ||||
* | Reword success to passing for pipeline badges | Z.J. van de Weg | 2017-07-21 | 1 | -1/+1 |
| | |||||
* | Rename build to pipeline for status badges | Z.J. van de Weg | 2017-07-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | First commit in probably 2, for resolve gitlab-org/gitlab-ce#15582. This commit is renaming files and classes from build to pipeline. Also wording is editted to pipeline. Given `pipeline` had more characters than `build`, I've made the field a bit wider. The width now matchers the one for the coverage badge, so they look nice when in a table format, or in a list. As soon as this commit is merged to master, and released, the build.svg is deprecated, meaning that all users which already placed a badge should update it. However, to make sure it keeps working tests are added for this case. | ||||
* | Merge branch '23036-replace-dashboard-activity-spinach' into 'master' | Rémy Coutable | 2017-07-19 | 2 | -150/+0 |
|\ | | | | | | | | | Replaces 'dashboard/event_filters.feature' spinach with rspec See merge request !12651 | ||||
| * | Replaces 'dashboard/activity.feature' spinach with rspec | Alexander Randa | 2017-07-17 | 2 | -150/+0 |
| | | |||||
* | | Merge branch '23036-replace-dashboard-spinach' into 'master' | Rémy Coutable | 2017-07-19 | 3 | -158/+0 |
|\ \ | | | | | | | | | | | | | Replaces dashboard/dashboard.feature spinach with rspec See merge request !12876 | ||||
| * | | Replaces dashboard/dashboard.feature spinach with rspec | Alexander Randa | 2017-07-17 | 3 | -158/+0 |
| | | | |||||
* | | | Update specs for new upload path | Bob Van Landuyt | 2017-07-18 | 3 | -3/+3 |
|/ / | |||||
* | | Replace 'browse_files.feature' spinach test with an rspec analog | blackst0ne | 2017-07-12 | 1 | -323/+0 |
|/ | |||||
* | Native group milestones | Felipe Artur | 2017-07-07 | 2 | -9/+4 |
| | |||||
* | Resolve "Inconsistent location of members page between groups and projects" | Tim Zallmann | 2017-07-07 | 2 | -6/+9 |
| | |||||
* | Merge branch '32408-allow-creation-of-files-and-dirs-with-spaces-in-web-ui' ↵ | Douwe Maan | 2017-07-05 | 2 | -14/+0 |
|\ | | | | | | | | | | | | | | | | | into 'master' Make filename and path creation compatible with UNIX in web UI Closes #21362 See merge request !12608 | ||||
| * | Removes file_name_regex from Gitlab::Regex32408-allow-creation-of-files-and-dirs-with-spaces-in-web-ui | Tiago Botelho | 2017-07-05 | 2 | -14/+0 |
| | | |||||
| * | Allow creation of files and directories with spaces in web UI | Tiago Botelho | 2017-07-05 | 1 | -1/+1 |
| | | |||||
* | | Create and use project path helpers that only need a project, no namespace | Douwe Maan | 2017-07-05 | 33 | -161/+160 |
| | | |||||
* | | Merge branch '23036-replace-snippets-spinach' into 'master' | Rémy Coutable | 2017-07-05 | 4 | -193/+0 |
|\ \ | | | | | | | | | | | | | Replace 'snippets/snippets.feature' spinach with rspec See merge request !12385 | ||||
| * | | Replace 'snippets/snippets.feature' spinach with rspec | Alexander Randa | 2017-07-05 | 4 | -193/+0 |
| | | | |||||
* | | | Merge branch '23036-replace-dashboard-new-project-spinach' into 'master' | Rémy Coutable | 2017-07-03 | 3 | -104/+0 |
|\ \ \ | |_|/ |/| | | | | | | | | Replaces 'dashboard/new-project.feature' spinach with rspec See merge request !12550 | ||||
| * | | Replaces 'dashboard/new-project.feature' spinach with rspec | Alexander Randa | 2017-06-29 | 3 | -104/+0 |
| | | | |||||
* | | | Merge branch 'inject-add-diff-note' into 'master' | Phil Hughes | 2017-06-30 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Render add-diff-note with server and optimize styles See merge request !12103 | ||||
| * | | | Render add-diff-note button with server. | Bryce Johnson | 2017-06-29 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves the rendering of the button back to the server, and shows/hides it using opacity rather than display. It also removes the transform applied to the button on hover (scale). Previously, both of these factors automatically triggered a reflow, which creates a performance bottleneck on pages with larger DOM size. MR: !12103 | ||||
* | | | Clean up issuable lists | Taurie Davis | 2017-06-29 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'dm-merge-request-creations-controller' into 'master' | Sean McGivern | 2017-06-29 | 2 | -3/+3 |
|\ \ | | | | | | | | | | | | | Split up MergeRequestsController See merge request !12150 | ||||
| * | | Split up MergeRequestsControllerdm-merge-request-creations-controller | Douwe Maan | 2017-06-28 | 2 | -3/+3 |
| | | | |||||
* | | | Merge branch 'dz-refactor-group-members-tests' into 'master' | Douwe Maan | 2017-06-27 | 1 | -59/+0 |
|\ \ \ | |/ / |/| | | | | | | | | Refactor group members tests See merge request !12465 | ||||
| * | | Move another group member spec from spinachdz-refactor-group-members-tests | Dmitriy Zaporozhets | 2017-06-26 | 1 | -7/+0 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Move "remove group member" spec from spinach to rspec | Dmitriy Zaporozhets | 2017-06-26 | 1 | -12/+0 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Remove group members spinach tests that we already covered with rspec | Dmitriy Zaporozhets | 2017-06-26 | 1 | -40/+0 |
| |/ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Merge branch '23036-replace-dashboard-todo-spinach' into 'master' | Rémy Coutable | 2017-06-27 | 3 | -223/+0 |
|\ \ | | | | | | | | | | | | | Replaces 'dashboard/todos' spinach with rspec See merge request !12453 | ||||
| * | | Replaces 'dashboard/todos' spinach with rspec | Alexander Randa | 2017-06-26 | 3 | -223/+0 |
| |/ | |||||
* | | Merge branch '23036-replace-dashboard-mr-spinach' into 'master' | Rémy Coutable | 2017-06-26 | 2 | -142/+0 |
|\ \ | | | | | | | | | | | | | Replace 'dashboard/merge_requests' spinach with rspec See merge request !12440 | ||||
| * | | Replaces 'dashboard/merge_requests' spinach with rspec | Alexander Randa | 2017-06-26 | 2 | -142/+0 |
| |/ | |||||
* | | Merge branch 'sh-revert-annotate-for-blame' into 'master' | Rémy Coutable | 2017-06-26 | 1 | -1/+0 |
|\ \ | | | | | | | | | | | | | Revert "Annotate" to "Blame" See merge request !12401 | ||||
| * | | Revert "Annotate" to "Blame"sh-revert-annotate-for-blame | Stan Hu | 2017-06-22 | 1 | -1/+0 |
| |/ |