Commit Graph

3468 Commits

Author SHA1 Message Date
Lin Jen-Shin 136dc79433 Have some simple way to create connection pool 2017-02-14 00:35:25 +08:00
Sean McGivern 84e1cc5592 Merge branch 'fix/cycle-analytics-events-limit' into 'master'
Add limit to the number of events showed in cycle analytics

See merge request !7743
2017-02-13 14:25:55 +00:00
Sean McGivern 42ad07c680 Merge branch '24976-start-of-line-mention' into 'master'
Feature to create directly addressed Todos when mentioned in beginning

Closes #24976

See merge request !7926
2017-02-13 13:10:15 +00:00
Rémy Coutable 6a1b3ef73f Merge branch 'zj-drop-ruby-21-tests' into 'master'
Update Rubocop to Ruby 2.3

See merge request !8994
2017-02-13 10:22:38 +00:00
Yorick Peterse a97dcc077c
Add method for creating foreign keys concurrently
This method allows one to create foreign keys without blocking access to
the source table, but only on PostgreSQL.

When creating a regular foreign key the "ALTER TABLE" statement used for
this won't return until all data has been validated. This statement in
turn will acquire a lock on the source table. As a result this lock can
be held for quite a long amount of time, depending on the number of rows
and system load.

By breaking up the foreign key creation process in two steps (creation,
and validation) we can reduce the amount of locking to a minimum.
Locking is still necessary for the "ALTER TABLE" statement that adds the
constraint, but this is a fast process and so will only block access for
a few milliseconds.
2017-02-10 21:51:09 +01:00
Alfredo Sumaran 7b20784715 Revert "Merge branch 'add-additional-checks-to-ca-data' into 'master' "
This reverts commit b7c5ca499d, reversing
changes made to 9745c98bb7.
2017-02-10 15:21:45 -05:00
Alfredo Sumaran b7c5ca499d Merge branch 'add-additional-checks-to-ca-data' into 'master'
Small improvements for Cycle Analytics

See merge request !9126
2017-02-10 18:48:49 +00:00
Rémy Coutable f60cb12f69 Merge branch 'zj-rename-issuable-issue-base' into 'master'
Rename issuable to IssueBase

See merge request !9127
2017-02-10 10:16:25 +00:00
Alfredo Sumaran ee698e9595 Restore exposure of legend property for events 2017-02-10 03:41:39 -05:00
Ershad Kunnakkadan 3a23639bc0
Create directly_addressed Todos when mentioned in beginning of a line 2017-02-08 21:53:34 +05:30
Z.J. van de Weg 1efa8f2e15 Rename issuable to IssueBase
Given the the Issuable class will soon also have to support MRs this
signals that it can only be used by issues.
2017-02-08 16:42:27 +01:00
Rémy Coutable 0fc474291e Merge branch 'feature/gb/paginated-environments-api' into 'master'
Expose paginated environments list API endpoint

See merge request !8928
2017-02-08 12:43:58 +00:00
Douwe Maan 2666ef9f04 Use stricter regex anchors 2017-02-07 14:26:00 -06:00
Douwe Maan 636e9bdd11 Support a string source in the route map 2017-02-07 14:19:12 -06:00
Robert Speicher 58eae0961e Merge branch 'route-map' into 'master'
Add 'View on [env]' link to blobs and individual files in diffs

See merge request !8867
2017-02-07 19:14:19 +00:00
Sean McGivern 38cb0347b2 Merge branch '21518_recaptcha_spam_issues' into 'master'
Use reCaptcha when an issue identified as spam

Closes #21518

See merge request !8846
2017-02-07 14:21:13 +00:00
Z.J. van de Weg 128b1eae09 Update Rubocop to ruby 2.3 2017-02-07 15:16:46 +01:00
Rémy Coutable 95a3e2da9b Merge branch 'fix/import-group-members' into 'master'
Fix missing group members from Import/Export

Closes #25124

See merge request !8923
2017-02-07 11:59:56 +00:00
Jarka Kadlecova 3d2954e457 Use reCaptcha when an issue identified as spam 2017-02-07 12:56:20 +01:00
Filipa Lacerda 14bf5c1009 Merge branch 'master' into feature/gb/paginated-environments-api
* master: (301 commits)
  added missed commit in rebase
  update Grape routes to work with current version of Grape
  adds changelog
  fixes cursor issue on pipeline pagination
  Use random group name to prevent conflicts
  List all groups/projects for admins on explore pages
  Fix indentation
  More backport
  Fix filtered search user autocomplete for gitlab instances that are hosted on a subdirectory
  Fixed variables_controller_spec.rb test
  Backport of the frontend view, including tests
  Updated the #create action to render the show view in case of a form error
  Improved code styling on the variables_controller_spec
  Added tests for the variables controller #update action
  Added a variable_controller_spec test to test for flash messages on the #create action
  Modified redirection logic in the variables cont.
  Added redirections to the index actions for the variables and triggers controllers
  Added a flash message to the creation of triggers
  Fixed tests, renamed files and methods
  Changed the controller/route name to 'ci/cd' and renamed the corresponding files
  ...
2017-02-07 11:31:44 +00:00
James Lopez 8409340b3b Add missing group members to export for I/E 2017-02-07 11:06:05 +01:00
Douwe Maan 50f5960c72 Merge branch 'ee-1439-read-only-user' into 'master'
Backport changes from gitlab-org/gitlab-ee!998

See merge request !8984
2017-02-07 04:10:13 +00:00
Douwe Maan ffcbc63693 List all groups/projects for admins on explore pages 2017-02-06 21:02:07 -06:00
Douwe Maan 9d7c5e7584 Address feedback 2017-02-06 18:06:46 -06:00
Douwe Maan c8b63a28af Improve performance of finding last deployed environment 2017-02-06 16:12:24 -06:00
Douwe Maan 3aa1264dc6 Add tests 2017-02-06 16:12:24 -06:00
Douwe Maan 8f85a11d9f Validate route map 2017-02-06 16:12:24 -06:00
Sean McGivern e6f5177b75 Merge branch 'fix-references-header-parsing' into 'master'
Fix References header parser for Microsoft Exchange

Closes #26567

See merge request !8620
2017-02-06 19:33:21 +00:00
Douwe Maan 9b13543542 Merge branch 'fix/gb/backwards-compatibility-coverage-ci-yml' into 'master'
Remove coverage entry from global CI/CD options

See merge request !8981
2017-02-06 18:32:33 +00:00
Lin Jen-Shin bec10d5852 No strong reasons to freeze them
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8620#note_22868713
2017-02-07 01:28:58 +08:00
James Lopez 1b7c186723 move query limit to base event fetcher 2017-02-06 16:23:55 +01:00
James Edwards-Jones b988faaf85 Merge branch 'master' into 'jej-pages-to-ce'
# Conflicts:
#   db/schema.rb
2017-02-06 15:12:27 +00:00
Grzegorz Bizon a7420b77bd Add specs for standalone pagination for serializers 2017-02-06 15:07:13 +01:00
Grzegorz Bizon 81eb5c7fd7 Move serializers pagination class to separate module
This helps to avoid conflicts with `Paginator` class that seems to be
used by some bundled libs.
2017-02-06 14:47:56 +01:00
Grzegorz Bizon 10c1a4d8e4 Rename `Gitlab::Serialize` module to reuse it later 2017-02-06 14:34:10 +01:00
Adam Niedzielski 5d3816652e Introduce maximum session time for terminal websocket connection
Store the value in application settings.
Expose the value to Workhorse.
2017-02-06 11:49:30 +01:00
Grzegorz Bizon 149f67cc2e Remove coverage entry from global CI/CD options 2017-02-04 23:04:17 +01:00
Mike Greiling 04dc2b76d7 Merge branch 'master' into go-go-gadget-webpack
* master: (181 commits)
  Fixed adding to list bug
  Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index
  Fixed modal lists dropdown not updating when list is deleted
  Fixed remove btn error after creating new issue in list
  Removed duplicated test
  Removed Masonry, instead uses groups of data
  Uses mixins for repeated functions
  Fixed up specs
  Props use objects with required & type values
  Removes labels instead of closing issue when clicking remove button
  Fixed JS lint errors
  Fixed issue card spec
  Added webkit CSS properties
  Fixed bug with empty state showing after search Fixed users href path being incorrect
  Fixed bug where 2 un-selected issues would stay on selected tab
  Fixed DB schema Changed how components are added in objects
  Added remove button
  Add optional id property to the issue schema
  Fixed issue link href
  Disabled add issues button if no lists exist
  ...
2017-02-03 13:17:03 -06:00
James Edwards-Jones 1af3f3b673 Merge branch 'master' into jej-pages-picked-from-ee 2017-02-03 17:25:26 +00:00
Dmitriy Zaporozhets 7dc8b6b204 Merge branch 'fwn-to-find-by-full-path' into 'master'
replace `find_with_namespace` with `find_by_full_path`

See merge request !8949
2017-02-03 11:23:21 +00:00
Lin Jen-Shin 2f80cbb675 Freeze regexp and add a comment
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8620#note_21590440
2017-02-03 17:37:06 +08:00
Lin Jen-Shin 849d09cfd6 Use references variable
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8620#note_22020035
2017-02-03 17:30:54 +08:00
Lin Jen-Shin f30e2a6ec7 Use message_id_regexp variable for the regexp
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8620#note_22021001
2017-02-03 17:29:29 +08:00
Lin Jen-Shin 0786894473 Merge remote-tracking branch 'upstream/master' into 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
  ...
2017-02-03 17:16:21 +08:00
Adam Pahlevi a0586dbc16 replace `find_with_namespace` with `find_by_full_path`
add complete changelog for !8949
2017-02-03 07:14:04 +07:00
Douwe Maan e7d530a624 Merge branch 'fix-git-hooks-when-creating-file' into 'master'
Don't execute git hooks if you create branch as part of other change

Closes #23439

See merge request !7237
2017-02-02 23:26:35 +00:00
Robert Speicher 1c13cea779 Merge branch '20452-remove-require-from-request_profiler-initializer' into 'master'
Don't require lib/gitlab/request_profiler/middleware.rb in config/initializers/request_profiler.rb

Closes #20452

See merge request !8927
2017-02-02 21:33:43 +00:00
Mike Greiling 7ca57c59c8 Merge branch 'master' into webpack
* master: (63 commits)
  Use `add_$role` helper in snippets specs
  removes old css class from everywhere
  Fixes broken build: Use jquery to get the element position in the page
  Check public snippets for spam
  Keep snippet visibility on error
  Update pipeline and commit URL and text on CI status change
  Support non-ASCII characters in GFM autocomplete
  Active tense test coverage
  Fix filtered search manager spec teaspoon error
  Reduce the number of loops that Cycle Analytics specs use
  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
  Improve styling of the new issue message
  Don't capitalize environment name in show page
  ...
2017-02-02 11:45:58 -06:00
Douwe Maan 93e98058ea Merge branch '20248-add-coverage-regex-in-job-yaml' into 'master'
Add ability to define a coverage regex in the .gitlab-ci.yml

Closes #20428

See merge request !7447
2017-02-02 17:01:52 +00:00
Rémy Coutable 6dcfc4002e Don't require lib/gitlab/request_profiler/middleware.rb in config/initializers/request_profiler.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-02-02 17:22:10 +01:00