summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove IIFEs29219-remove-iifes-gAlfredo Sumaran2017-03-316-1254/+1202
|
* Merge branch '24861-stringify-group-member-details' into 'master'Clement Ho2017-03-302-2/+6
|\ | | | | | | | | | | | | Hide form inputs for group member without editing rights Closes #24861 See merge request !7816
| * Remove unnecessary variableKushal Pandya2017-02-281-2/+1
| |
| * Remove author nameKushal Pandya2017-02-271-1/+1
| |
| * Changelog entry for issue #24861Kushal Pandya2017-02-271-0/+4
| |
| * Hide form inputs for user without accessKushal Pandya2017-02-271-2/+3
| |
* | Merge branch '30289-allow-users-to-import-github-projects-to-subgroups' into ↵Robert Speicher2017-03-303-1/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Allow users to import GitHub projects to subgroups Closes #30289 and #30148 See merge request !10344
| * | Allow users to import GitHub projects to subgroupsDouglas Barbosa Alexandre2017-03-303-1/+19
|/ /
* | Merge branch 'fix-docs-check-links' into 'master' Achilleas Pipinellis2017-03-301-1/+1
|\ \ | | | | | | | | | | | | Fix the docs:check:links job See merge request !10340
| * | Fix the docs:check:links jobRémy Coutable2017-03-301-1/+1
|/ / | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '30284-fix-repo-clean-rules' into 'master' Robert Speicher2017-03-301-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Don't clean up the gitlab-test-fork_bare repo Closes #30284 See merge request !10342
| * | Don't clean up the gitlab-test-fork_bare repoNick Thomas2017-03-301-2/+2
| | |
* | | Merge branch '29883-retry-button' into 'master' Annabel Dunstone Gray2017-03-301-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Adds container option for tooltip to prevent the button from losing round corners Closes #29883 See merge request !10317
| * | Adds container option for tooltip to prevent the button from losing round ↵Filipa Lacerda2017-03-291-0/+1
| | | | | | | | | | | | corners
* | | Merge branch 'allow-multiple-paths-in-repository-log' into 'master' Robert Speicher2017-03-302-5/+29
|\ \ \ | | | | | | | | | | | | | | | | Support >1 path in Gitlab::Git::Repository#log See merge request !10291
| * | | Support >1 path in Gitlab::Git::Repository#logSean McGivern2017-03-302-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | This is analogous to `git log -- foo bar baz`, but not the same as `Gitlab::Git::Repository#log(path: 'foo bar baz')`, which would run `git log -- 'foo bar baz'`.
* | | | Merge branch 'ipython-notebook-viewer-improvements' into 'master' Jacob Schatz2017-03-302-2523/+2540
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Added worksheets support to notebook viewer See merge request !10307
| * | | | Added worksheets support to notebook viewerPhil Hughes2017-03-302-2523/+2540
| | | | | | | | | | | | | | | | | | | | Updated some Ruby code based on comments
* | | | | Merge branch '30063-builds-sidebar-stutter' into 'master' Filipa Lacerda2017-03-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add subnav height to sidebar scroll calculation Closes #30063 See merge request !10262
| * | | | | Add subnav height to sidebar scroll calculationAnnabel Dunstone Gray2017-03-281-1/+1
| | | | | |
* | | | | | Merge branch 'patch-15' into 'master' Achilleas Pipinellis2017-03-301-0/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tip about `CI_JOB_TOKEN` clone abilities with "new job permissions model" See merge request !10221
| * | | | | | Add tip about general git clone authentication.Johan Brandhorst2017-03-291-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CI_JOB_TOKEN post 8.12 allows the cloning of any repositories that are accessible by the triggering user. This was not documented anywhere, and the documentation was in particular very specific on git submodule dependency management. This commit adds a tip about cloning arbitrary repository paths.
* | | | | | | Merge branch 'group-links-select2-infinite-scroll' into 'master' Rémy Coutable2017-03-305-16/+139
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | group links select2 infinite scroll Closes #20013 See merge request !9807
| * | | | | | | group links select2 infinite scrollLuke "Jared" Bennett2017-03-305-16/+139
|/ / / / / / /
* | | | | | | Merge branch 'rs-spinach-reporter' into 'master' Rémy Coutable2017-03-301-0/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Monkey patch the Spinach StdoutReporter to show scenario locations See merge request !10321
| * | | | | | | Monkey patch the Spinach StdoutReporter to show scenario locationsRobert Speicher2017-03-291-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: Scenario: Viewing invitation when signed out ✔ Given "John Doe" is owner of group "Owned" # features/steps/shared/group.rb:8 After: Scenario: Viewing invitation when signed out # features/invites.feature:6 ✔ Given "John Doe" is owner of group "Owned" # features/steps/shared/group.rb:8 Now if a scenario fails we can easily rerun it with a specific line number.
* | | | | | | | Merge branch 'rs-empty-project-misc' into 'master' Rémy Coutable2017-03-3035-58/+59
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `:empty_project` in worker, view, task, serializer, policy, migration, and mailer specs See merge request !10272
| * | | | | | | | Use `:empty_project` where possible in worker specsRobert Speicher2017-03-2714-18/+18
| | | | | | | | |
| * | | | | | | | Use Project `:repository` trait where necessary in view specsRobert Speicher2017-03-2711-17/+14
| | | | | | | | |
| * | | | | | | | Use Project `:repository` trait where necessary in task specsRobert Speicher2017-03-271-3/+3
| | | | | | | | |
| * | | | | | | | Use `:empty_project` where possible in serializer specsRobert Speicher2017-03-274-11/+10
| | | | | | | | |
| * | | | | | | | Use `:empty_project` where possible in policy specsRobert Speicher2017-03-272-2/+2
| | | | | | | | |
| * | | | | | | | Use Project `:repository` trait where necessary in migration specsRobert Speicher2017-03-271-1/+1
| | | | | | | | |
| * | | | | | | | Use `:empty_project` where possible in mailer specsRobert Speicher2017-03-272-6/+11
| | | | | | | | |
* | | | | | | | | Merge branch 'tc-cleanup-application-settings-spec' into 'master' Sean McGivern2017-03-302-16/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup application settings spec See merge request !10189
| * | | | | | | | | Remove redundant code to convert restricted_levels to integersToon Claes2017-03-232-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ApplicationSetting#restricted_visibility_levels= now takes care of converting string formatted levels to integers.
| * | | | | | | | | Resolve future conflicts with CE -> EE mergeToon Claes2017-03-231-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE already includes specs for the ApplicationSettingsController, so ensure future changes will be easier to merge to EE.
* | | | | | | | | | Merge branch '30248-fix-production-admin-fixture' into 'master' Sean McGivern2017-03-303-4/+23
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix production admin fixture to use the new `Users::CreateService` Closes #30248 See merge request !10326
| * | | | | | | | | | Fix production admin fixture to use the new `Users::CreateService`Rémy Coutable2017-03-303-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch '26595-fix-issue-preselected-template' into 'master' Rémy Coutable2017-03-303-1/+22
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix linking to new issue with selected template Closes #26595 See merge request !10155
| * | | | | | | | | | | Fix linking to new issue with selected templateEric Eastwood2017-03-293-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/26595
* | | | | | | | | | | | Merge branch '28799-todo-creation' into 'master' Sean McGivern2017-03-309-48/+178
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create todos only for new mentiones Closes #28799 See merge request !10279
| * | | | | | | | | | | | Create todos only for new mentionsJarka Kadlecova2017-03-299-48/+178
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'update-eyeballs-docs' into 'master' Jacob Schatz2017-03-301-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs regarding visibility lib See merge request !10295
| * | | | | | | | | | | | | Update docs regarding visibility libFilipa Lacerda2017-03-281-2/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'bump-gitlab-shell-version' into 'master' Sean McGivern2017-03-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bumps gitlab shell version See merge request !10329
| * | | | | | | | | | | | | | bumps gitlab shell versionTiago Botelho2017-03-301-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'test-doc-image' into 'master' Rémy Coutable2017-03-303-6/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test docs internal links check See merge request !9509
| * | | | | | | | | | | | | | Test docs internal links checkAchilleas Pipinellis2017-03-303-6/+27
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch '24784-system-notes-meta-data' into 'master' Sean McGivern2017-03-3013-65/+335
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add metadata for system notes See merge request !9964