summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Don't persist ApplicationSetting in test envdont-persist-application-settings-in-test-envRémy Coutable2017-01-151-20/+48
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch ↵Douwe Maan2017-01-141-3/+0
|\ | | | | | | | | | | | | | | | | | | '25018-gitlab-checks-changeaccess-looks-for-user-permissions-that-don-t-exist' into 'master' Resolve "`Gitlab::Checks::ChangeAccess` looks for user permissions that don't exist" Closes #25018 See merge request !8551
| * Remove useless permission checks in Gitlab::Checks::ChangeAccess25018-gitlab-checks-changeaccess-looks-for-user-permissions-that-don-t-existRémy Coutable2017-01-121-3/+0
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '26587-metrics-middleware-endpoint-is-nil' into 'master' Yorick Peterse2017-01-141-0/+11
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Metrics middleware: endpoint is nil" Closes #26587 See merge request !8544
| * | Check for env[Grape::Env::GRAPE_ROUTING_ARGS] instead of endpoint.route26587-metrics-middleware-endpoint-is-nilRémy Coutable2017-01-121-0/+11
| |/ | | | | | | | | | | | | `endpoint.route` is calling `env[Grape::Env::GRAPE_ROUTING_ARGS][:route_info]` but `env[Grape::Env::GRAPE_ROUTING_ARGS]` is `nil` in the case of a 405 response Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Allow to use ENV variables in redis configSemyon Pupkov2017-01-131-1/+15
|/
* Merge branch 'zj-unadressable-url-variables' into 'master' Douwe Maan2017-01-122-17/+13
|\ | | | | | | | | | | | | Do not check for valid url for .gitlab-ci.yml Closes #22970 See merge request !8451
| * Do not check for valid url for .gitlab-ci.ymlZ.J. van de Weg2017-01-052-17/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Until this commit, GitLab would check if the URL in your .gitlab-ci.yml would be valid and adressable. However, this approach is rather limited. To begin, the URL couldn't be http://example:$PORT/my-project, as the PORT value would be interpolated after checking if the URL was valid, which its not. Also this gem will limit the amount of protocols allowed. This commit doesn't check, at all, if the URL is valid. This is now the responsablilty of the user. In my opion this is right, as the user ultimately benefits from a correct URL, but also, its impossible to cover all cases.
* | Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR enables rendering of PlantUML diagrams in Asciidoc documents. To add a PlantUML diagram all we need is to include a plantuml block like: ``` [plantuml, id="myDiagram", width="100px", height="100px"] -- bob -> alice : ping alice -> bob : pong -- ``` The plantuml block is substituted by an HTML img element with *src* pointing to an external PlantUML server. This MR also add a PlantUML integration section to the Administrator -> Settings page to configure the PlantUML rendering service and to enable/disable it. Closes: #17603
* | Fix Rubocop offenses in LDAP related code and specGrzegorz Bizon2017-01-101-2/+2
| |
* | Merge branch 'restore-backup-when-env-variable-is-passed' into 'master' Sean McGivern2017-01-101-16/+98
|\ \ | | | | | | | | | | | | | | | | | | Restore backup correctly when "BACKUP" environment variable is passed Closes #26090 See merge request !8477
| * | Restore backup correctly when "BACKUP" environment variable is passedrestore-backup-when-env-variable-is-passedAdam Niedzielski2017-01-091-16/+98
| | |
* | | Merge branch 'master' into auto-pipelines-vueRegis2017-01-095-13/+94
|\ \ \
| * \ \ Merge branch '19086-double-newline' into 'master' Sean McGivern2017-01-091-0/+8
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Fix Double Spaced CI Log Closes #19086 See merge request !8349
| | * | Test newline and carraige return groupsJared Deckard2016-12-281-0/+8
| | | |
| * | | Merge branch 'feature/log-ldap-to-application-log' into 'master' Rémy Coutable2017-01-091-8/+55
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Log LDAP blocking/unblocking events to application log See merge request !8042
| | * | | fixup! Log messages when blocking/unblocking LDAP accountsMarkus Koller2016-12-201-1/+1
| | | | |
| | * | | Log messages when blocking/unblocking LDAP accountsMarkus Koller2016-12-201-8/+55
| | | | |
| * | | | Merge branch 'track_last_used_date_of_ssh_keys' into 'master' Sean McGivern2017-01-091-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Record and show last used date of SSH Keys See merge request !8113
| | * | | | Record and show last used date of SSH KeysVincent Wong2017-01-091-0/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses: Issue #13810 1. Adds a last_used_at attribute to the Key table/model 2. Update a key's last_used_at whenever it gets used 3. Display how long ago an ssh key was last used
| * | | | LDAP attributes needs default valuesDrew Blessing2017-01-062-5/+30
| | |_|/ | |/| |
* | | | Merge branch 'master' into auto-pipelines-vueFilipa Lacerda2017-01-0514-0/+3404
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (35 commits) Adds back removed class in merge request pipelines table Fix dropdown icon alignment Simplify HTML of mini pipeline graph and dropdown Creates individual html for dropdown Adds simplified CSS for the new dropdown Removes old CSS Improves dropdown item in Chrome, Firefox and Safari Use SCSS variables for colors. Fix scss linter errors Adds animation when the stage is hovered. Adds back tooltip on dropdown toggle Fixes broken tests additional css changes to get more into direction of mockups Adds CHANGELOG entry Removes unneeded `window` declaration Decreases font-size on login page Ensure internal Gitlab::Git references use the namespace Absorb gitlab_git Fix review comments. Add spec for note edit and fix one commented spec. Review fixes. Use gl.utils.isInViewport and improve gl.utils.animateToElement. Make sure elements share the same scope Hide edit warning element when form reverted. Remove unnecessary styling came from merge conflicts. Fix single note edit form specs. Separate edit form in Changes and Discussions tab. Fix warning styling for responsive design. Fix task list for single edit note widget changes. Fix notes spec. ...
| * | | Ensure internal Gitlab::Git references use the namespacers-absorb-gitlab_gitRobert Speicher2017-01-042-2/+2
| | | |
| * | | Absorb gitlab_gitRobert Speicher2017-01-0414-0/+3404
| | | |
* | | | Merge branch 'master' into auto-pipelines-vueRegis2017-01-041-0/+44
|\ \ \ \ | |/ / /
| * | | Gitlab::LDAP::Person uses LDAP attributes configurationDrew Blessing2017-01-031-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We allow users to configure LDAP attribute preferences. For example, email can be configured to use `mail`, `email` and `userPrincipalName`, falling through to the next until a value is found. Prior to this change, Gitlab::LDAP::Person did not honor this configuration. Now, the class will honor `name` and `mail` configuration. It does not handle `username`, or fallback to `first_name` + `last_name` in the absence of `name`.
* | | | fix pipelines/index.html.haml merge conflictRegis2017-01-027-22/+55
|\ \ \ \ | |/ / /
| * | | Merge branch 'issue_25682' into 'master' Sean McGivern2016-12-291-1/+11
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Parse JIRA issue references even if Issue Tracker is disabled Closes #25682 See merge request !8238
| | * | Parse JIRA issue references even if Issue Tracker is disabledFelipe Artur2016-12-291-1/+11
| | | |
| * | | Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-273-14/+29
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to add deploy keys with write-access Closes #1376 See merge request !7383
| | * | | Use consistent names and move checks to the method,Lin Jen-Shin2016-12-202-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and move those checks to be private. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_20285012 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_20285279
| | * | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-2063-369/+2212
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (538 commits) Reject blank environment vcariables in Gitlab::Git::RevList Add online terminal documentation Add changelog entry Add terminal UI and controller actions Fix specs Even out padding on plus button in breadcrumb menu Update font size of detail page header to 14px Update CHANGELOG.md for 8.13.10 Update CHANGELOG.md for 8.14.5 Fix Route#rename_children behavior Remove inline-block styling from status Add terminals to the Kubernetes deployment service Add a ReactiveCaching concern for use in the KubernetesService Add xterm.js 2.1.0 and a wrapper class to the asset pipeline Remove unnecessary hidden svg elements for icons. Fix consistent typo in environment.js Use a block to insert extra check for authenticate_build! Align milestone column header with count number Add Wiki import to BB importer Make CI badge hitboxes better match container ...
| | * | | Merge CSSFilipa Lacerda2016-12-1222-6/+550
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-0629-208/+1043
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (488 commits) Merge branch 'issue_25064' into 'security' It's secret variables, not secure Fix dead links, add example of debug trace output, simplify titles Authorize users into imported GitLab project Document button secondary states. Update icons and color section Remove unused votes.scss Remove unused errors css Fixed MR widget content wrapping for XS viewports NIGNX -> Nginx Use pry-byebug instead byebug Fixed influence from other specs. Accept `issue new` as command to create an issue Update paranoia from 2.1.4 to 2.2.0. Use the pagination helper in the API Added changelog for #25221 Fixed top margin for Builds page status header information Satisfied eslint Fix compatibility with Internet Explorer 11 for merge requests change the date label to match the date used fix gfm doc typo about two spaces for next line transfer ...
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-11-2229-44/+1184
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (497 commits) Use single quote for strings Ue svg from SVGs object Dont trigger CI builds [ci skip] Revert "Test only migrations" Add custom copy for each empty stage Fetch only one revision Highlight nav item on hover Test only migrations Fix migration paths tests Scroll CA stage panel on mobile Fix CSS declaration administer to administrator Move SVGs to JS objects for easy reuse Improve deploy command message No enough data to Not enough data Keep the cookie name as before Fix variable usage Evalute time_ago method instead of printing it Removed button styling from restricted visibility levels and added checkboxes with icons Do not show overview message if there’s already CA data ...
| | * | | | | | Fix an old copypasta: internal -> privateLin Jen-Shin2016-11-181-1/+1
| | | | | | | |
| | * | | | | | We never check user privilege if it's a deploy keyLin Jen-Shin2016-11-181-18/+0
| | | | | | | |
| | * | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-11-1731-120/+317
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (236 commits) Mention Git strategy none Remove ToC since it's now supported in the docs portal itself Add 8.14 to versions with further additions to review apps Add Limitations sections to environments and review apps docs Add link to environments docs Fix URL to review apps docs Add a prerequisites section, add some links Link to NGINX example project for the time being Get rid most of the irrelevant sections Add note about current limitation in $CI_BUILD_REF_NAME Add an intro and an Overview section for Review Apps WIP review apps Add Review apps link to CI README Add stop environment permissions and remove delete Add note about auto-stopping of environments Update CHANGELOG.md for 8.13.6 Finish "Stopping envs" and "Grouping similar envs" sections Highlight first user autocomplete option Remove ToC and fix headings in Markdown docs Revert "Merge branch '22680-unlabel-limit-autocomplete-to-selected-items' into 'master'" ...
| | * | | | | | | Introduce no_user_or_blocked? and fix tests due toLin Jen-Shin2016-11-161-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checking user permission.
| | * | | | | | | Fix a typo: acccess -> accessLin Jen-Shin2016-11-111-1/+1
| | | | | | | | |
| | * | | | | | | Add more tests and fix write to project checkLin Jen-Shin2016-11-111-7/+31
| | | | | | | | |
| | * | | | | | | Correct the test. Not sure why change it in the first placeLin Jen-Shin2016-11-111-1/+1
| | | | | | | | |
| | * | | | | | | Mark DeployKey#can_push a safe attributeLin Jen-Shin2016-11-111-1/+2
| | | | | | | | |
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-11-10121-625/+5677
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (3852 commits) Grapify token API Fix cache for commit status in commits list to respect branches Grapify milestones API Grapify runners API Improve EeCompatCheck, cache EE repo and keep artifacts for the ee_compat_check task Use 'Forking in progress' title when appropriate Fix CHANGELOG after 8.14.0-rc1 tag Update CHANGELOG.md for 8.14.0-rc1 Fix YAML syntax on CHANGELOG entry Remove redundant rescue from repository keep_around Remove redundant space from repository model code Remove order-dependent expectation Minor CHANGELOG.md cleanups Add a link to Git cheatsheet PDF in docs readme Grapify the session API Add 8.13.5, 8.12.9, and 8.11.11 CHANGELOG Merge branch 'unauthenticated-container-registry-access' into 'security' Merge branch '23403-fix-events-for-private-project-features' into 'security' Merge branch 'fix-unathorized-cloning' into 'security' Merge branch 'markdown-xss-fix-option-2.1' into 'security' ...
| | * | | | | | | | Allow to add deploy keys with write-accessAli Ibrahim2016-08-171-4/+7
| | | | | | | | | |
| * | | | | | | | | Merge branch 'bugfix/outlook-language-parsing' into 'master' Douwe Maan2016-12-271-2/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to Discourse's EmailReplyTrimmer for more robust reply parsing See merge request !7473
| | * | | | | | | | | Revert "allow empty-quotes"http://jneen.net/2016-12-211-17/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4f2f678aff8d7dfcac96c47cf7eb480a5707ddaf.
| | * | | | | | | | | allow empty-quoteshttp://jneen.net/2016-12-211-2/+17
| | | | | | | | | | |
| | * | | | | | | | | remove trailing whitespace from email bodieshttp://jneen.net/2016-12-211-1/+1
| | | | | | | | | | |
| | * | | | | | | | | switch to email_reply_trimmer from discoursehttp://jneen.net/2016-12-211-3/+1
| | | | | | | | | | |