Commit Graph

3441 Commits

Author SHA1 Message Date
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 Edwards-Jones b988faaf85 Merge branch 'master' into 'jej-pages-to-ce'
# Conflicts:
#   db/schema.rb
2017-02-06 15:12:27 +00: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
Lin Jen-Shin 54fca95160 Merge remote-tracking branch 'upstream/master' into 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
  ...
2017-02-02 11:54:35 +08:00
Robert Speicher 6d54212713 Merge branch '24462-reduce_ldap_queries_for_lfs' into 'master'
Reduce hits to LDAP on Git HTTP auth by reordering auth mechanisms

Closes #24462

See merge request !8752
2017-02-01 22:47:51 +00:00
Mike Greiling a2d837a371 add rack middleware to proxy webpack dev server 2017-02-01 16:23:26 -06:00
Kamil Trzciński e27416300f Merge branch 'zj-format-chat-messages' into 'master'
Format chat messages

Closes #24917 and #25746

See merge request !8528
2017-02-01 18:41:17 +00:00
Kamil Trzcinski 2c2447771f Rename pages namespace or project path when changed
- Move UploadsTransfer to ProjectTransfer and inherit from this to UploadsTransfer and PagesTransfer
2017-01-31 22:53:56 +00:00
James Lopez 8ea1dafe83 use destroy_all 2017-01-31 19:20:35 +01:00
James Lopez 918eaba0c3 remove old project members from project 2017-01-31 16:32:26 +01:00
Z.J. van de Weg 164eb3aa37 Improve styling of the new issue message 2017-01-31 13:42:04 +01:00
Kamil Trzciński 5ac590677f Merge branch '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
2017-01-31 11:42:06 +00:00
Rémy Coutable 211f728ad2 Merge branch 'feature/gb/expose-commit-and-mr-pipelines-api' into 'master'
Expose pipelines API for commits and merge requests

See merge request !8837
2017-01-31 07:48:40 +00:00
Z.J. van de Weg d7f298c177 Incorporate feedback 2017-01-30 20:37:06 +01:00
Drew Blessing 29414ab043 Reduce hits to LDAP on Git HTTP auth by reordering auth mechanisms
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.
2017-01-30 13:05:47 -06:00
James Lopez 017a5068f6 fix spec failure 2017-01-30 14:26:32 +01:00
James Lopez 1a2d13c821 programmatically remove encrypted attributes. Added relevant spec. 2017-01-30 12:34:32 +01:00
James Lopez eeb13c16d1 rename method and added note to export file spec about new encrypted attributes 2017-01-30 12:34:32 +01:00
James Lopez 6a2b976c66 fix typo 2017-01-30 12:34:32 +01:00
James Lopez e589c7e848 Ignore encrypted attributes in Import/Export
* Regenerates tokens for all models that have them
* Remove variables, since they are basically just storing encrypted data
* Bumped version up to 0.1.6
* Updated related docs
2017-01-30 12:34:32 +01:00
Z.J. van de Weg 5ec214b0a5 Rename presenters for consitency 2017-01-30 09:33:04 +01:00
Z.J. van de Weg 4ce1a17c97 Incorporate feedback 2017-01-30 09:25:15 +01:00
Z.J. van de Weg 53846da2c7 Add help command 2017-01-30 09:25:15 +01:00
Z.J. van de Weg dc6921bdbb Chat Commands have presenters
This improves the styling and readability of the code. This is supported
by both Mattermost and Slack.
2017-01-30 09:24:05 +01:00
Mike Greiling 7e51cd32d3 update scripts and docs to reference the newly namespaced rake task 2017-01-27 15:23:09 -06:00
Rémy Coutable f575fe46a7 Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-27 16:16:55 +01:00
Rémy Coutable c446cfcbae Move ApplicationSetting DEFAULTS to `.defaults` instead
This will avoid autoloading issues in the long term.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-27 16:16:55 +01:00
Grzegorz Bizon 6b3f52b46c Fix cycle analytics code after improving serializers 2017-01-27 14:37:14 +01:00
Robert Speicher b9ff4656a8 Merge branch '26943-fix-user-in-build-presenter' into 'master'
Don't override Ci::Build#user when presenting a build

Closes #26943

See merge request !8668
2017-01-27 11:30:57 +00:00
Filipa Lacerda 7db05c4da1 Removed unused method 2017-01-26 19:56:07 +00:00