Commit graph

18 commits

Author SHA1 Message Date
Lin Jen-Shin
68f964ad14 Merge remote-tracking branch 'upstream/master' into show-commit-status-from-source-project
* upstream/master: (409 commits)
  Update endpoint to username validator
  change border color to variable
  Add todo for deprecated user routes and more information about deprecation to changelog
  Provide better error message to the user
  Apply better hierarchy to markdown headers and issue/mr titles
  Swapped button text manipulation outcomes for the toggle query
  Fixed find file keyboard navigation
  Update CHANGELOG for 8.12.7
  Added download-button class and applied button margin
  Enable activerecord_sane_schema_dumper for test
  Updated logo from @luke
  Fix broken specs on MySQL after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6896
  Fix Test Env (proper error handling when gitlab-shell is not clonned)
  Fix randomly crashing spinach test for merge request
  [Great spinach fix] Replace gsub with delete
  Remove carriage returns from commit description as summary is on a newline and will always include carriage returns
  Convert due_date_select.js filetype to es6.
  Stop directly parsing due_date with Date.parse, prefer parsing implicitly.
  Improve spec for pipeline metrics worker
  Add Pipeline metrics worker
  ...
2016-10-18 09:31:30 +00:00
Z.J. van de Weg
6a4f710083 Show what time ago a MR was deployed 2016-10-14 11:07:00 +02:00
Lin Jen-Shin
90baa1fe60 Merge remote-tracking branch 'upstream/master' into show-commit-status-from-source-project
* upstream/master: (327 commits)
  Formatted all app/assets/javascripts to underscore naming convention
  Add registry to skipped data in backup raketask docs
  Updating changes based on feedback from @connorshea
  Changes to make Git basics more intuitive - updated verbiage where appropriate - changed "git config" commands to include quotes for variables to be more in line with standard practive and to avoid issues with spaces - updated CHANGELOG as part of commit
  Remove Ci::ApplicationController
  HTMLEntityFilter -> HtmlEntityFilter
  Clarify which token should be used to delete a runner
  Changed 'Compare branches, tags or commit ranges' to 'Compare Git revisions'
  Changed placeholder to 'Commit hash'
  Add link to test coverage report to README
  Added copy file path button to diffs
  Fix wrong icon in CI build detail sidebar: right-arrow => arrow-right
  Prevent conflict b/w search field and its dropdown
  Make searching for commits case insensitive.
  Use user from let instead recreate in before
  reword html titles for merge requests and issues
  Fix a typo in doc/api/labels.md
  Check for transition loopback in commit status
  Add temporary fix for race condition in MWBS
  Improve transitions and run hooks after transaction
  ...
2016-10-11 03:31:30 +00:00
Lin Jen-Shin
f11ebb9556 Add a view test for showing source commits 2016-10-05 18:08:16 +08:00
Phil Hughes
cc88fa4d5b Merge branch 'master' into revert-c676283b 2016-10-03 09:10:20 +01:00
Katarzyna Kobierska
1b547cfba8 Improve grammar 2016-09-30 11:28:05 +02:00
Katarzyna Kobierska
25edb0709c Close merge request if open without source project 2016-09-30 11:28:05 +02:00
Connor Shea
8062380f60 Upgrade Devise from 4.1.1 to 4.2.0.
This fixes an issue with Rails 5 and brings us up-to-date with the latest Devise release.

This also replaces the deprecated Devise::TestHelpers with Devise::Test::ControllerHelpers.

Changelog: https://github.com/plataformatec/devise/blob/v4.2.0/CHANGELOG.md#420---2016-07-01
2016-09-27 20:08:49 -06:00
Kamil Trzcinski
9410599391 Scope environments to project 2016-09-21 13:19:34 +02:00
Phil Hughes
69db604e55 Updated tests 2016-09-02 14:00:57 +01:00
Katarzyna Kobierska
8ed6e2ec7a Fix test 2016-08-30 13:05:40 +02:00
Katarzyna Kobierska
6b02c82cfe Improve grammar 2016-08-30 13:05:40 +02:00
Katarzyna Kobierska
2e08f11569 Improve code 2016-08-30 13:05:40 +02:00
Katarzyna Kobierska
c9c2503c51 User can edit closed MR with deleted fork
Add test for closed MR without fork

Add view test visibility of Reopen and Close buttons

Fix controller tests and validation method

Fix missing space

Remove unused variables from test

closed_without_fork? method refactoring

Add information about missing fork

When closed MR without fork can't edit target branch

Tests for closed MR edit view

Fix indentation and rebase, refactoring
2016-08-30 13:05:40 +02:00
Z.J. van de Weg
07fc2f852a Method names changed to #includes_commit? 2016-08-12 10:43:04 +02:00
Z.J. van de Weg
03ea019465 CI build status not per environment 2016-08-11 21:29:58 +02:00
Z.J. van de Weg
b497b0ce3f Incorporate feedback 2016-08-11 21:29:57 +02:00
Z.J. van de Weg
826862d48e Tests for release status heading on MR#show 2016-08-11 21:29:57 +02:00