summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Unblocks user when active_directory is disabled and it can be foundpatch/fix-ldap-unblock-user-logicGabriel Mazetto2016-04-051-1/+26
|
* Merge branch 'added-milestone-upcoming' into 'master' Rémy Coutable2016-03-302-6/+72
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Dropdown bug fixes - Added back upcoming to milestone filter ![Screen_Shot_2016-03-23_at_16.45.22](/uploads/8c31eff7e0984aad17881f6397ff17cd/Screen_Shot_2016-03-23_at_16.45.22.png) - Fixed bug that would cause the currently selected value to disappear on filters - Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past Closes #14536 See merge request !3368
| * Spec updatesadded-milestone-upcomingPhil Hughes2016-03-292-8/+6
| |
| * Updated based on Ruby feedbackPhil Hughes2016-03-292-4/+4
| |
| * Added tests for upcoming milestone filterPhil Hughes2016-03-292-0/+68
| |
* | Merge branch ↵Robert Speicher2016-03-291-3/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'mariusz_jachimowicz/gitlab-ce-i_14415_expose_label_description' into 'master' api - expose label description Resolves #14415 See merge request !3314
| * | api - expose label descriptionMariusz Jachimowicz2016-03-241-3/+26
| | |
* | | Merge branch 'fix_wip_in_mr_api' into 'master' Robert Speicher2016-03-292-4/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ensuring Merge Request API returns boolean values for work_in_progress Fixes #14692. See merge request !3432
| * | | Ensuring Merge Request API returns boolean values for work_in_progressAbhi Rao2016-03-282-4/+15
| | | | | | | | | | | | | | | | Fixes #14692
* | | | Merge branch 'handle-nil-description-slack-message' into 'master' Robert Speicher2016-03-291-0/+10
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Handle nil descriptions in Slack issue messages Closes #14676 See merge request !3420
| * | | Handle nil descriptions in Slack issue messagesStan Hu2016-03-281-0/+10
| | | | | | | | | | | | | | | | Closes #14676
* | | | Merge branch 'fix/nomethod-error-on-ci' into 'master' Rémy Coutable2016-03-291-0/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error when visiting CI root path Closes #14528, closes #14687 See merge request !3377
| * | | | Redirect to root path when visiting `/ci`fix/nomethod-error-on-ciGrzegorz Bizon2016-03-291-5/+16
| | | | |
| * | | | Add definition of before action that has been movedGrzegorz Bizon2016-03-251-0/+10
| | | | | | | | | | | | | | | | | | | | Closes #14528
* | | | | Merge branch 'fix-14607' into 'master' Douwe Maan2016-03-294-0/+341
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure private project snippets are not viewable by unauthorized people Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14607 See merge request !1946
| * | | | | Ensure project snippets have their own access levelRémy Coutable2016-03-253-0/+234
| | | | | |
| * | | | | Ensure private project snippets are not viewable by unauthorized peopleRémy Coutable2016-03-251-0/+107
| |/ / / / | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/14607.
* | | | | Merge branch 'functional-sidebar' into 'master' Dmitriy Zaporozhets2016-03-282-52/+27
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Updates sidebar to use new dropdowns for issues and merge requests Fixes #12935, #13164 See merge request !3175
| * | | | Fix minor code style issuesJacob Schatz2016-03-251-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Fix underscore template error. Fix `=` spacing
| * | | | Fix features until tests pass.Jacob Schatz2016-03-251-47/+35
| | | | | | | | | | | | | | | | | | | | | | | | | Milestones needed a none selector Assignee needed unassign.
| * | | | Fix specsAlfredo Sumaran2016-03-251-1/+1
| |/ / /
* | | | Merge branch 'api-ability-to-backdate-newly-created-issues-12628' into 'master' Robert Speicher2016-03-281-0/+11
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Back dating of issues when creating through the API Closes #12628 See merge request !3408
| * | | Back dating of issues when creating throught the APIZeger-Jan van de Weg2016-03-281-0/+11
| |/ /
* | | Merge branch 'handle-avatar-in-empty-repo' into 'master' Stan Hu2016-03-272-0/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't attempt to look up an avatar in repo if repo directory does not exist Relates to https://sentry.gitlap.com/gitlab/gitlabcom/issues/3507/ Closes #14580 See merge request !3390
| * | | Don't attempt to look up an avatar in repo if repo directory does not existStan Hu2016-03-252-0/+12
| |/ / | | | | | | | | | Closes #14580
* | | Merge branch 'feature--preferences-dashboard-groups' of ↵Dmitriy Zaporozhets2016-03-262-1/+25
|\ \ \ | | | | | | | | | | | | https://gitlab.com/eliasw/gitlab-ce
| * | | Implementing 'Groups View' and 'TODOs View' as options for dashboard ↵Elias Werberich2016-03-242-1/+25
| |/ / | | | | | | | | | | | | | | | preferences. Fixes #14585.
* | | Merge branch 'ci-setup-info' into 'master' Dmitriy Zaporozhets2016-03-261-1/+20
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | Add links to CI setup documentation from project settings and builds pages For #14483 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3384
| * | Small refactoring and rewordingDmitriy Zaporozhets2016-03-251-5/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Use head tree (cached) for file search. Also add some testsDmitriy Zaporozhets2016-03-241-0/+23
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Rename `Event#proper?` to `Event#visible_to_user?`Douglas Barbosa Alexandre2016-03-241-22/+22
| |
* | Comments on confidential issues doesn't show in activity feed to non-membersDouglas Barbosa Alexandre2016-03-241-14/+40
|/
* Fix specs broken by !3270 and !3337.fix-frontend-specsRémy Coutable2016-03-241-1/+1
|
* Merge branch 'update-issues-tests' into 'master' Robert Speicher2016-03-231-0/+117
|\ | | | | | | | | | | | | | | Multi-update issues tests There were no tests for updating multiple issues at a time - this fixes that :thumbsup: See merge request !3357
| * Update milestone specupdate-issues-testsPhil Hughes2016-03-231-11/+41
| |
| * Assignee testsPhil Hughes2016-03-231-0/+40
| |
| * Added tests for setting multiple status on issuesPhil Hughes2016-03-231-0/+47
| |
* | Merge branch 'fix/issue-move-preserve-update-time' into 'master' Douwe Maan2016-03-231-2/+19
|\ \ | | | | | | | | | | | | | | | | | | Preserve time notes has been updated at when moving issue Closes #14490 See merge request !3356
| * | Preserve time notes has been updated at when moving issueGrzegorz Bizon2016-03-231-2/+19
| |/
* | Test dependencies defined as symbolsKamil Trzcinski2016-03-231-0/+6
| |
* | Fix build dependencies, when the dependency is a stringKamil Trzcinski2016-03-231-3/+3
| |
* | Add missing Dashboard::LabelsControllerRémy Coutable2016-03-231-0/+29
|/
* Merge branch 'fix-sorting-by-votes-on-groups-page' into 'master' Douwe Maan2016-03-231-2/+57
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix sorting issues/mrs by votes on the groups page Closes #14394 The `non_archived` scope applied here https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/controllers/concerns/issues_action.rb#L5 overrides the previous `ORDER BY` applied inside the IssuesFinder, with the default scope of the Project model, resulting in SQL errors. ```ruby Issue.reorder(created_at: :desc).joins(:project).to_sql => "SELECT issues.* FROM issues INNER JOIN projects ON projects.id = issues.project_id ORDER BY issues.created_at DESC" Issue.reorder(created_at: :desc).joins(:project).merge(Project.non_archived).to_sql => "SELECT issues.* FROM issues INNER JOIN projects ON projects.id = issues.project_id WHERE projects.archived = 'f' ORDER BY projects.id DESC" Issue.reorder(created_at: :desc).joins(:project).merge(Project.non_archived.only(:where)).to_sql => "SELECT issues.* FROM issues INNER JOIN projects ON projects.id = issues.project_id WHERE projects.archived = 'f' ORDER BY issues.created_at DESC" ``` /cc @yorickpeterse See merge request !3333
| * Fix sorting issues/mrs by votes on the groups pagefix-sorting-by-votes-on-groups-pageDouglas Barbosa Alexandre2016-03-211-2/+57
| | | | | | | | | | | | | | | | The `non_archived` scope applied here https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/controllers/conc erns/issues_action.rb#L5 overrides the previous `ORDER BY` applied inside the IssuesFinder, with the default scope of the Project model, resulting in SQL errors.
* | Merge branch 'notifications-for-subscribers-confidential-issue-labels' into ↵Douwe Maan2016-03-232-1/+94
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Restrict notifications for confidential issues Closes #14468 /cc @rymai See merge request !3334
| * | Restrict notifications for confidential issuesDouglas Barbosa Alexandre2016-03-222-1/+94
| | |
* | | Do not allow to move issue if it has not been persistedmove-issue-section-should-not-be-displayed-in-the-new-issue-form-14489Grzegorz Bizon2016-03-232-0/+11
| | |
* | | Merge branch 'drop_db_before_restore' into 'master' Robert Speicher2016-03-221-18/+22
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reload the schema before restoring a database backup If a user tries to downgrade and restore after a failed upgrade, the database may still contain newer tables. Reload the older schema before restoring the database to avoid future upgrade problems. Also, add a rake task to help users add migration versions to the database so it's easier to recover from these errors if they do occur. Fixes #13419 See merge request !2807
| * | Reload the schema before restoring a database backupDrew Blessing2016-03-211-18/+22
| | |
* | | Merge branch 'feature-ci-only-except-trigger' into 'master' Kamil Trzciński2016-03-221-0/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI: Add 'triggers' keyword to 'only' and 'except' lists to allow control over when triggers cause builds to run Currently, the `only` and `except` keywords in `.gitlab-ci.yml` only accept ref names or the special `branches` and `tags` keywords. However, these are primarily useful when controlling how repository activity affects the creation of builds. In my case, instead of building on every commit, I'd like to use the following logic: - If the repository is tagged, do a build. - Any other normal commits should not cause a build. - If a build is triggered via the API, always create one for the specified ref. From what I can tell, this isn't possible via the existing YAML syntax. In this MR, I introduce a new keyword `triggers` that goes along with `branches` and `tags`. I can implement the logic above using the following job configuration: ```yaml only: - tags - triggers ``` I updated the tests and documentation to reflect this and everything seems to pass. See merge request !3230