summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Freeze regexp and add a commentfix-references-header-parsingLin Jen-Shin2017-02-031-1/+3
| | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8620#note_21590440
* Use references variableLin Jen-Shin2017-02-031-1/+3
| | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8620#note_22020035
* Use message_id_regexp variable for the regexpLin Jen-Shin2017-02-031-1/+3
| | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8620#note_22021001
* Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-02-03103-473/+1174
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-references-header-parsing * upstream/master: (574 commits) remove dateFormat global exception fix relative paths to xterm.js within fit.js use setFixtures instead of fixture.set prevent u2f tests from triggering a form submission while testing simplify test for focus state preload projects.json fixture preload projects.json fixture rework tests which rely on teaspoon-specific behavior Only render hr when user can't archive project. use setFixtures instead of fixture.set ensure helper classes and constants are exposed globally preload projects.json fixture fix fixture references in environments_spec allow console.xxx in tests, reorder eslint rules alphabetically remove redundant "data-toggle" attribute so Vue doesn't complain fix broken reference to formatDate in a CommonJS environment fix errors within gl_dropdown_spec.js when running in Karma fix intermittant errors in merge_commit_message_toggle_spec.rb Update installation docs to include Docker, others ignore node_modules in rubocop ...
| * Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-023-5/+3
| |\ | | | | | | | | | | | | | | | | | | Don't execute git hooks if you create branch as part of other change Closes #23439 See merge request !7237
| | * Merge remote-tracking branch 'upstream/master' into ↵fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-0244-218/+553
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (190 commits) Remove unnecessary returns / unset variables from the CoffeeScript -> JS conversion. update spec Change the reply shortcut to focus the field even without a selection. use destroy_all Remove settings cog from within admin scroll tabs; keep links centered add changelog remove old project members from project add spec replicating validation error Fix small typo on new branch button spec Improve styling of the new issue message Don't capitalize environment name in show page Abillity to promote project labels to group labels Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles Update and pin the `jwt` gem to ~> 1.5.6 refactor merge request build service Update index.md Clarify that Auto Deploy requires a public project. 19164 Add settings dropdown to mobile screens cop for gem fetched from a git source Add CHANGELOG entry ...
| | * \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-01-26137-575/+4452
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (1122 commits) Update CHANGELOG.md for 8.16.2 Display project ID in project settings (!8572) fixed points from comments to improve code quality Update CHANGELOG.md for 8.14.8 Statisfy eslint Add CHANGELOG entry Fix access to the wiki code via HTTP when repository feature disabled Display fullscreen button on small screens (!5302) Prevent removing fields from dropdowns on input elements fix for all themes Return struct instead of multiple values Fix race conditions for AuthorizedProjectsWorker Add User#nested_groups and User#nested_projects methods Fix spec failure due to timestamp ordering issue in mySQL Fixed error with filter keyboard tests `can?` already includes the `feature_available?` check Test there is no Merge Request button when MRs are disabled Ensure the correct Merge Request button is found Add 409 conflict tests Add CHANGELOG ...
| | * | | Fix renamingLin Jen-Shin2017-01-072-2/+2
| | | | |
| | * | | Fix for initial commit and remove unneeded argsLin Jen-Shin2017-01-061-2/+0
| | | | |
| | * | | Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-04123-914/+3282
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1031 commits) Add changelog entry for renaming API param [ci skip] Add missing milestone parameter Refactor issues filter in API Fix project hooks params Gitlab::LDAP::Person uses LDAP attributes configuration Don't delete files from spec/fixtures Copy, don't move uploaded avatar files Minor improvements to changelog docs Rename logo, apply for Slack too Fix Gemfile.lock for the octokit update Fix cross-project references copy to include the project reference Add logo in public files Use stable icon for Mattermost integration rewrite the item.respond_to?(:x?) && item.x? to item.try(:x?) API: extern_uid is a string Increases pipeline graph drowdown width in order to prevent strange position on chrome on ubuntu Removed bottom padding from merge manually from CLI because of repositioning award emoji's Make haml_lint happy Improve spec Add feature tests for Cycle Analytics ...
| | * | | | Unify parameters and callback after hooksLin Jen-Shin2016-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19747856
| * | | | | Merge branch '20452-remove-require-from-request_profiler-initializer' into ↵27537-flash-of-human-un-friendly-utc-timestampRobert Speicher2017-02-021-2/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Don't require lib/gitlab/request_profiler/middleware.rb in config/initializers/request_profiler.rb Closes #20452 See merge request !8927
| | * | | | | Don't require lib/gitlab/request_profiler/middleware.rb in ↵20452-remove-require-from-request_profiler-initializerRémy Coutable2017-02-021-2/+1
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | config/initializers/request_profiler.rb Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Merge branch '27516-fix-wrong-call-to-project_cache_worker-method' into ↵Robert Speicher2017-02-021-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix wrong call to ProjectCacheWorker.perform, and call ProjectCacheWorker.perform_async instead Closes #27516 See merge request !8910
| | * | | | | Fix wrong call to ProjectCacheWorker.perform27516-fix-wrong-call-to-project_cache_worker-methodRémy Coutable2017-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's either ProjectCacheWorker#perform or ProjectCacheWorker.perform_async! Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Merge branch '20248-add-coverage-regex-in-job-yaml' into 'master'Douwe Maan2017-02-027-15/+86
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to define a coverage regex in the .gitlab-ci.yml Closes #20428 See merge request !7447
| | * | | | | | Make some other refinements to validation logicLeandro Camargo2017-01-251-2/+2
| | | | | | | |
| | * | | | | | Make more code improvements around the '/' stripping logicLeandro Camargo2017-01-252-8/+8
| | | | | | | |
| | * | | | | | Force coverage value to always be surrounded by '/'Leandro Camargo2017-01-253-17/+40
| | | | | | | |
| | * | | | | | Comply to more requirements and requests made in the code reviewLeandro Camargo2017-01-252-4/+3
| | | | | | | |
| | * | | | | | Simplify coverage setting and comply to some requests in code reviewLeandro Camargo2017-01-252-16/+6
| | | | | | | |
| | * | | | | | Fix wrong description for Coverage entry (in ruby comments)Leandro Camargo2017-01-251-1/+1
| | | | | | | |
| | * | | | | | Add specs to cover the implemented feature and fix a small bugLeandro Camargo2017-01-251-1/+1
| | | | | | | |
| | * | | | | | Add `coverage` to the Global config entry as wellLeandro Camargo2017-01-251-1/+4
| | | | | | | |
| | * | | | | | Change expected `coverage` structure for CI configuration YAML fileLeandro Camargo2017-01-254-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using: `coverage: /\(\d+.\d+%\) covered/` This structure must be used now: ``` coverage: output_filter: /\(\d+.\d+%\) covered/` ``` The surrounding '/' is optional.
| | * | | | | | Comply to requests made in the review and adjust to the Entry/Node changesLeandro Camargo2017-01-254-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit: * Turns `coverage_regex` into `coverage` entry in yml file * Fixes smaller requests from code reviewers for the previous commit * This commit is temporary (will be squashed afterwards) This commit does not (further commits will do though): * Add global `coverage` entry handling in yml file as suggested by Grzegorz * Add specs * Create changelog * Create docs
| | * | | | | | Add ability to define a coverage regex in the .gitlab-ci.ymlLeandro Camargo2017-01-255-5/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Instead of using the proposed `coverage` key, this expects `coverage_regex`
| * | | | | | | Merge branch 'snippet-spam' into 'master' Rémy Coutable2017-02-022-2/+2
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snippet spam Closes #26276 See merge request !8911
| | * | | | | | Check public snippets for spamSean McGivern2017-02-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the same spam checks to public snippets (either personal snippets that are public, or public snippets on public projects) as to issues on public projects.
| * | | | | | | Merge branch '24462-reduce_ldap_queries_for_lfs' into 'master' Robert Speicher2017-02-011-3/+8
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce hits to LDAP on Git HTTP auth by reordering auth mechanisms Closes #24462 See merge request !8752
| | * | | | | | | Reduce hits to LDAP on Git HTTP auth by reordering auth mechanismsDrew Blessing2017-01-301-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We accept half a dozen different authentication mechanisms for Git over HTTP. Fairly high in the list we were checking user password, which would also query LDAP. In the case of LFS, OAuth tokens or personal access tokens, we were unnecessarily hitting LDAP when the authentication will not succeed. This was causing some LDAP/AD systems to lock the account. Now, user password authentication is the last mechanism tried since it's the most expensive.
| * | | | | | | | Merge branch 'zj-format-chat-messages' into 'master' Kamil Trzciński2017-02-0116-182/+442
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format chat messages Closes #24917 and #25746 See merge request !8528
| | * | | | | | | Improve styling of the new issue messagezj-format-chat-messagesZ.J. van de Weg2017-01-311-2/+2
| | | | | | | | |
| | * | | | | | | Incorporate feedbackZ.J. van de Weg2017-01-307-13/+38
| | | | | | | | |
| | * | | | | | | Rename presenters for consitencyZ.J. van de Weg2017-01-3011-36/+30
| | | | | | | | |
| | * | | | | | | Incorporate feedbackZ.J. van de Weg2017-01-309-180/+279
| | | | | | | | |
| | * | | | | | | Add help commandZ.J. van de Weg2017-01-303-8/+53
| | | | | | | | |
| | * | | | | | | Revert removing of some filesZ.J. van de Weg2017-01-303-0/+167
| | | | | | | | |
| | * | | | | | | Chat Commands have presentersZ.J. van de Weg2017-01-3015-336/+266
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the styling and readability of the code. This is supported by both Mattermost and Slack.
| * | | | | | | use destroy_allJames Lopez2017-01-311-3/+1
| | | | | | | |
| * | | | | | | remove old project members from projectJames Lopez2017-01-311-0/+4
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch ↵Kamil Trzciński2017-01-315-11/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25910-convert-manual-action-icons-to-svg-to-propperly-position-them' into 'master' Convert pipeline action icons to svg to have them propperly positioned Closes #25910 See merge request !8766
| | * | | | | | Removed unused methodFilipa Lacerda2017-01-262-7/+0
| | | | | | | |
| | * | | | | | Remove unneeded 'borderless' from icons nameFilipa Lacerda2017-01-254-5/+5
| | | | | | | |
| | * | | | | | added icons and fixed mini pipeline action dropdown iconsdimitrieh2017-01-254-4/+4
| | | | | | | |
| * | | | | | | Merge branch 'feature/gb/expose-commit-and-mr-pipelines-api' into 'master'Rémy Coutable2017-01-317-7/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose pipelines API for commits and merge requests See merge request !8837
| | * | | | | | | Fix cycle analytics code after improving serializersGrzegorz Bizon2017-01-277-7/+7
| | | | | | | | |
| * | | | | | | | Use full group name/path in UI dropdownsDmitriy Zaporozhets2017-01-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Merge branch 'fix/import-encrypt-atts' into 'master' Douwe Maan2017-01-303-7/+20
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore encrypted attributes in Import/Export Closes #24458 See merge request !8739
| | * | | | | | | | fix spec failurefix/import-encrypt-attsJames Lopez2017-01-301-1/+1
| | | | | | | | | |
View Lorry Controller Status