Commit Graph

328 Commits

Author SHA1 Message Date
Stan Hu 2d3fcf9048 Merge branch 'no-more-bosses' into 'master'
Rename endboss -> maintainer, miniboss -> reviewer

See merge request !8719
2017-01-23 21:10:13 +00:00
Fatih Acet c3bea33c99 Merge branch 'patch-9' into 'master'
Add documentation for possible causes of JS-related test failures.

See merge request !8214
2017-01-19 14:27:33 +00:00
Sean McGivern e2585e642a Rename endboss -> maintainer, miniboss -> reviewer
We want to describe these roles in a way that is more understandable to
people not familiar with GitLab.
2017-01-13 16:12:02 +00:00
Allison Whilden 6ca4b6a38d Merge branch 'ux-copy-capitalization-punctuation' into 'master'
Improve UX copy docs on capitalization and punctuation

See merge request !8439
2017-01-06 18:26:58 +00:00
Achilleas Pipinellis 0a1d1fbd29 Merge branch 'ux-guide-search-box' into 'master'
UX Guide: add section on search box

See merge request !8429
2017-01-05 11:29:23 +00:00
Allison Whilden 9c11a4949d [ci skip] UX Guide: Add new primary and secondary text colors 2017-01-04 12:28:19 -08:00
Pedro Moreira da Silva 58154ccf71 Improve UX copy docs on capitalization and punctuation 2017-01-04 19:22:00 +00:00
Allison Whilden 7282294394 [ci skip] UX Guide: add section on search box 2017-01-03 15:18:25 -08:00
Robert Speicher c59dfad9ff Minor improvements to changelog docs
[ci skip]
2017-01-03 09:26:42 -05:00
Annabel Dunstone Gray cbee5f00fd Merge branch 'ux-guide-color-update' into 'master'
UX Guide: split state and action guidance for color

See merge request !8204
2016-12-28 14:37:43 +00:00
Annabel Dunstone Gray 8afe8fb463 Merge branch 'ux-guide-scroll-animation' into 'master'
UX Guide: add moving transition animation guidance

See merge request !8147
2016-12-28 14:34:29 +00:00
Chris Wilson 7422ea7a3e Set SIDEKIQ_LOG_ARGUMENTS in gitlab.rb 2016-12-28 11:22:21 +00:00
Sean McGivern ee5cc454d7 Merge branch 'ux-guide-copy-discussion' into 'master'
UX Guide: add comment and discussion to copy

See merge request !8206
2016-12-26 12:04:44 +00:00
Allison Whilden 77da936b73 [ci skip] UX Guide: split state and action guidance for color
[ci skip] UX Guide: Add retry to blue
2016-12-22 12:48:28 -08:00
Pablo Carranza 3cace951cd Update architecture diagram 2016-12-22 19:08:18 +01:00
Allison Whilden c6f0f8f0d4 [ci skip] UX Guide: add comment and discussion to copy
[ci skip] UX Guide: refine discussion definition
2016-12-22 08:38:46 -08:00
Pablo Carranza 328be22f4d Add Gitaly to the architecture of the application
Added both to the graph, and to the high level overview. Explaining what
is the goal of the system and how does it connect to the other systems.
2016-12-22 15:47:06 +01:00
Bryce Johnson ec5c12ce77 Fix markdown errors. 2016-12-21 15:11:22 +00:00
Bryce Johnson 2c9ee1bb42 Add documentation for possible causes of JS-related test failures. 2016-12-21 10:58:00 +00:00
James Edwards-Jones bea9795531 Fix link from doc/development/performance.md to 'Performance Monitoring' 2016-12-17 06:19:12 +00:00
Allison Whilden c2410c48a1 [ci skip] UX Guide: add moving transition animation guidance 2016-12-16 09:01:53 -08:00
Allison Whilden fb4d763c13 [ci skip] UX Guide: add guidance on cursor usage 2016-12-15 15:15:17 -08:00
awhildy 30f0504916 Create animation page and clean up index
Add guidance on timings and easing

[ci skip]

Detail when not to use easing

Add dropdown and hover examples

Add quick update animation
2016-12-05 14:09:24 -08:00
Chris Peressini 877c225c4a Document button secondary states. Update icons and color section
Describe hover, focus and active states for primary and secondary
buttons.

Organized the icons section in a table. Replaced images for icons
so they are all the same size.

Organized the color section in a table. Replaced the images with
new ones so the table would have a more manageable size. Updated
the values for some colors to show the $color-light shade.

Remove commented sections

Remove `db/schema.rb`

Add db/schema.rb from origin/master

Fix typos
2016-12-05 12:21:44 -08:00
Kamil Trzciński 0f90fd639c Merge branch 'fix/rename-mwbs-to-merge-when-pipeline-succeeds' into 'master'
Rename MWBS service to Merge When Pipeline Succeeds

## What does this MR do?

This MR renames Merge When Build Succeeds feature to Merge When Pipeline Succeeds, because we recently changed the behavior, see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6675.

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] All builds are passing

## What are the relevant issue numbers?

Closes #23354

See merge request !7135
2016-12-05 11:07:57 +00:00
Robert Speicher 63b57e5e35 Merge branch 'doc/extend-code-review-guidelines' into 'master'
Extend code review docs with chapter about the right balance

[ci skip]

See merge request !7838
2016-12-02 08:10:31 +00:00
Grzegorz Bizon ebef1a8441 Remove change to MWBS in code review guideline
[ci skip]
2016-12-02 08:55:53 +01:00
Grzegorz Bizon 85c4aa4a67 Copy-edit text about right balance in code reviews
[ci skip]
2016-12-01 10:42:35 +01:00
Mike Greiling 94ae12f697 remove id collision caveat from documentation 2016-11-30 15:28:10 -06:00
Grzegorz Bizon 00ca7adca2 Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeeds
* master: (110 commits)
  Rewrite an HTTP link to use HTTPS
  Edit /spec/features/profiles/preferences_spec.rb to match changes in 084d90ac
  Add blue back to sub nav active
  Remove JSX/React eslint plugins.
  Fix a transient spec failure
  Adds hoverstates for collapsed Issue/Merge Request sidebar
  Moved groups above projects
  Add StackProf to the Gemfile, along with a utility to get a profile for a spec
  Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1
  Add a CHANGELOG entry
  Alert user when logged in user email is not the same as the invitation
  Expose timestamp in build entity used by serializer
  Rename `MergeRequest#pipeline` to `head_pipeline`
  Remove unnecessary database indexes
  CE-specific changes gitlab-org/gitlab-ee#1137
  Fixing typo & Clarifying Key name
  fix started_at check
  fix blob controller spec failure - updated not to use file-path-
  fix blob controller spec failure
  Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security'
  ...

Conflicts:
	app/controllers/projects/merge_requests_controller.rb
	lib/api/merge_requests.rb
	spec/requests/api/merge_requests_spec.rb
2016-11-30 12:21:33 +01:00
Grzegorz Bizon 5b052605b7 Extend code review docs with chapter about the right balance 2016-11-30 11:23:09 +01:00
Robert Speicher 4ecb959492 Merge branch 'add-stackprof' into 'master'
Add StackProf to the Gemfile, along with a utility to get a profile for a spec

The test suite needs speeding up significantly. This is one tool for investigating it.

Related to #23034

See merge request !7784
2016-11-30 05:29:29 +00:00
Nick Thomas 5e05f9c5c2 Add StackProf to the Gemfile, along with a utility to get a profile for a spec 2016-11-29 14:14:34 +00:00
Robert Speicher 25c1256736 Merge branch 'refactor-issuable-description-and-metadata' into 'master'
Refactor issuable description and metadata form sections

Continuation of https://gitlab.com/gitlab-org/gitlab-ce/issues/23864.

Brother of gitlab-org/gitlab-ee!916.

See merge request !7758
2016-11-29 04:57:09 +00:00
Achilleas Pipinellis 297c868398 Add guidelines in doc linking with HAML
[ci skip]
2016-11-28 18:27:29 +01:00
awhildy 5a5e03b5aa [ci skip] UX Guide: Anchor hover guidance include color change
Primary and secondary links should be dark blue on hover

Update anchor image to dark blue for secondary

Clean up markdown

Fix anchorlinks image
2016-11-26 21:38:50 -08:00
awhildy a1f53e92ca [ci skip] UX Guide: add guidance for max height for dropdowns
Fix spelling
2016-11-25 20:30:13 -08:00
Rémy Coutable 2ec4d167b6
Refactor issuable description and metadata form sections
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-25 17:40:36 +01:00
Grzegorz Bizon 895d97af87 Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeeds
* master: (312 commits)
  Fix bad selection on dropdown menu for tags filter
  Fixed issue boards scrolling with a lot of lists & issues
  You can only assign default_branch when editing a project ...
  Don't convert data which already is the target type
  Stop supporting Google and Azure as backup strategies
  renames some of the specs and adds changelog entry
  Fixed dragging issue moving wrong issue after multiple drags of issue
  Fixed issue boards issue sorting when dragging issue into list
  Rephrase some system notes to be compatible with new system note style
  Add missing JIRA file that redirects to the new location
  Fix documentation to create the `pg_trm` extension before creating the DB
  Document that we always use `do...end` for `before` in RSpec
  Backport Note#commands_changes from EE
  Log mv_namespace parameters
  Add default_branch attr to Project API payload in docs.
  Fix title case to sentence case
  properly escape username validation error message flash
  Remove header ids from University docs
  Add missing documentation.
  Added test that checks the correct select box is there for the LFS ...
  ...

Conflicts:
	app/services/system_note_service.rb
	spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb
	spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb
	spec/services/system_note_service_spec.rb
2016-11-25 11:05:34 +01:00
Rémy Coutable 39378d0e97 Document that we always use `do...end` for `before` in RSpec
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-24 17:36:09 +08:00
Achilleas Pipinellis af1dabe805 Reduce size of images from 25MB to 13MB using pngquant
Took it from https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/3232

[ci skip]
2016-11-22 19:53:43 +01:00
Achilleas Pipinellis d6603493ea Merge branch 'ux-guide-update-mr-copy' into 'master'
Add Approve and Remove approval to UX Guide terminology table

Updating UX Guide page on terminology to include guidance on 'Approve' and 'Remove approval'.

See merge request !7632
2016-11-22 11:16:11 +00:00
Achilleas Pipinellis acaa6d733b Merge branch 'object-state-models-docs' into 'master'
Object state models docs

Object state models docs for issues and merge requests.

This is to start documenting object models, focused more on users and how they experience the product.

See merge request !7544
2016-11-22 10:33:47 +00:00
awhildy 4a411f2711 [ci skip] Add Approve and Remove Approval to UX Guide terminology table 2016-11-21 12:44:37 -08:00
Grzegorz Bizon c6a4f9fc5b Update some docs to reflect MWPS name change 2016-11-21 11:27:28 +01:00
Victor Wu e887e96893 Remove contents section since it's not necessary [ci skip] 2016-11-20 15:44:21 +00:00
Victor Wu 88cc283fd7 Remove hyphen [ci skip] 2016-11-18 21:04:21 +00:00
Victor Wu bef75852a0 Remove hyphen [ci skip] 2016-11-18 21:03:49 +00:00
Victor Wu 709e590d3b Add spaces to conform to style guide [ci skip] 2016-11-18 17:59:43 +00:00
Lin Jen-Shin 9c4e0d6445 Use `Gitlab.config.gitlab.host` over `'localhost'`
This would fix long standing failures running tests on
my development machine, which set `Gitlab.config.gitlab.host`
to another host because it's not my local computer. Now I
finally cannot withstand it and decided to fix them once and
for all.
2016-11-18 20:17:10 +08:00