Commit Graph
22804 Commits
Author SHA1 Message Date
Douwe Maan 03604b39eb Merge branch 'doc_github_import' into 'master'
Refactor GitHub importer documentation

To be merged when gitlab-org/gitlab-ce!2324 is finished.

See merge request !2390
2016-01-15 12:11:14 +00:00
Robert Speicher f093d8ccb4 Merge branch 'deleting-a-note-after-editing-another-results-in-a-javascript-error' into 'master'
Fix javascript error with deleting messages in issue or merge request

Elements searched for by jQuery no longer existed in the DOM.
Javascript was also unnecessarily complex, for using jQuery

Fixes #8109

See merge request !2442
2016-01-15 04:27:24 +00:00
Robert Speicher 041ca926e0 Update CHANGELOG
Moving 8.5 change to 8.4 since we're merging master into stable for now.

[ci skip]
2016-01-14 21:33:49 -05:00
Jacob Schatz daf60957d9 Fix javascript error with deleting messages in issue or merge request
Elements searched for by jQuery no longer existed in the DOM.
Javascript was also unnecessarily complex, for using jQuery
Fixes #8109
2016-01-14 19:09:46 -05:00
Robert Speicher 9d8926b750 Merge branch 'rs-woff2' into 'master'
Prefer custom WOFF2 fonts if the browser supports them

[ci skip]

See merge request !2443
2016-01-14 22:35:51 +00:00
Robert Speicher 6fd92ad4a9 Prefer custom WOFF2 fonts if the browser supports them
[ci skip]
2016-01-14 17:33:54 -05:00
Kamil Trzciński 948bb655f3 Merge branch 'ci/api-triggers' into 'master'
Add triggers API

References #4264

See merge request !2286
2016-01-14 21:56:00 +00:00
Dmitriy Zaporozhets 0192903b23 Merge branch 'fixes-new-layout' into 'master'
Fixes new layout

* fix empty project page
* fix commit -> builds page missing margin

See merge request !2440
2016-01-14 21:42:05 +00:00
Tomasz Maczukin 96aeaeafb5 Update CHANGELOG 2016-01-14 21:59:30 +01:00
Tomasz Maczukin 768721dc58 Merge branch 'master' into ci/api-triggers
* master: (150 commits)
  fixes margin and padding
  Update mailroom/postfix documentation [ci skip]
  Fix css mess around git clone panel. Align it properly
  Fix missing padding for user/group pages
  Fix parse_gollum_tags matcher
  Update documentation on Banzai::Filter::GollumTagsFilter
  Add tests for the wiki pipeline
  Refactoring Banzai::Filter::GollumTagsFilter
  Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatter
  Remove GollumTagsPipeline
  Refactoring Gitlab::GithubImport::Importer
  Remove unnecessary brackets on WIKI_SLUG_ID route constraints
  Move js function to removing accents to vendor/assets/javascripts
  Update CHANGELOG
  Use the WikiPipeline when rendering the wiki markdown content
  Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTML
  Relax constraints for wiki slug
  Import GitHub wiki into GitLab
  Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatus
  Revert changes to how the notes are paginated in the API
  ...

Conflicts:
	doc/api/README.md
	lib/api/entities.rb
2016-01-14 21:58:17 +01:00
Drew Blessing 2f2aada3b6 Merge branch 'notification-btn-in-left-field' into 'master'
fixes margin and padding

![Screen_Shot_2016-01-14_at_3.10.57_PM](/uploads/83c8b36b01439cb629c91b2dd3a85692/Screen_Shot_2016-01-14_at_3.10.57_PM.png)


See merge request !2439
2016-01-14 20:52:18 +00:00
Dmitriy Zaporozhets cd2ddaaa45 add missing padding for commit -> builds page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-14 21:47:12 +01:00
Dmitriy Zaporozhets cc52018988 Fix layout for empty project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-14 21:44:20 +01:00
Jacob Schatz 7b18b6ad6e fixes margin and padding 2016-01-14 15:10:33 -05:00
Robert Speicher 17d4b39806 Merge branch 'diff-parse-first-commit' into 'master'
Properly generate diff of orphan commits, like the first commit in a
repository

Fixes gitlab-org/gitlab_git#14

See merge request !2427
2016-01-14 14:29:08 -05:00
Robert Speicher 65eae647a6 Merge branch 'backport-ee' into 'master'
Backport two commits from EE

Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/110

See merge request !2424
2016-01-14 18:39:49 +00:00
Robert Speicher 14695798fb Merge branch 'rs-fix-cross-reference' into 'master'
Fix cross-project reference clipboard text

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2339

See merge request !2420
2016-01-14 18:07:57 +00:00
Drew Blessing e777710a10 Merge branch 'update_mail_docs' into 'master'
Update mailroom/postfix documentation [ci skip]

I worked with a customer to troubleshoot some strange Postfix and Mailroom issues. These doc updates aim to help other users avoid the same confusion.


See merge request !2430
2016-01-14 17:28:08 +00:00
Drew Blessing 98c689d968 Update mailroom/postfix documentation [ci skip] 2016-01-14 11:26:24 -06:00
Dmitriy Zaporozhets 62b2fcc0f3 Merge branch 'ui-fixes' into 'master'
Various UI fixes

* Fix missing padding for user/group pages
* Fix align of clone panel

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !2433
2016-01-14 17:09:33 +00:00
Dmitriy Zaporozhets f8707e26ad Fix css mess around git clone panel. Align it properly
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-14 17:42:15 +01:00
Douwe Maan ba42b03348 Merge branch 'ci/api-builds' into 'master'
Add builds API

References #4264

See merge request !2207
2016-01-14 16:29:15 +00:00
Dmitriy Zaporozhets 49c310e45c Fix missing padding for user/group pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-14 16:42:25 +01:00
Dmitriy Zaporozhets 0eef82761f Merge branch 'add-pagination-headers-to-api' into 'master'
Add pagination headers to already paginated API resources

Following #3045, I've added pagination headers using already available Kaminari methods.

## Pagination headers in action

![Screen_Shot_2016-01-14_at_12.14.53](/uploads/88807f754dd9aafbb24da85f6bdf9521/Screen_Shot_2016-01-14_at_12.14.53.png)

---

I've also added a shared example to test paginated API resources.

A possible next step would be to paginate all the API resources that return an array.

See merge request !2426
2016-01-14 15:20:16 +00:00
Dmitriy Zaporozhets 0430c00cf0 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-01-14 16:19:38 +01:00
Dmitriy Zaporozhets fc9a2a3e70 Merge remote-tracking branch 'origin/rs-autosize' 2016-01-14 16:19:16 +01:00
Douwe Maan b6454fef56 Merge branch 'import-gh-wiki' into 'master'
Import GitHub wiki into GitLab

Closes #2834 

GitHub doesn’t apply any constraints to theirs wiki slug allowing chars like ,, :, *, etc, we need to remove our constraints or some wiki pages will not be available after they are imported.

Some wikis use the Gollum's tags to link its internal/external resources like: images, urls, wiki pages, etc. So, to avoid that wiki links/images displays completely broken after they were imported, we added a new `WikiPipeline`, that for now will parse only simple links, and image tags.

##### Before `WikiPipeline`:

![Screenshot_2016-01-11_20.14.48](/uploads/46fd5dbb5acfc70aa8ecca3050b675e4/Screenshot_2016-01-11_20.14.48.png)

##### After `WikiPipeline`:

![Screenshot_2016-01-11_20.15.56](/uploads/b1d94aa852f385f867a7868c358b4257/Screenshot_2016-01-11_20.15.56.png)

See merge request !2324
2016-01-14 15:08:42 +00:00
Douwe Maan b6ae2def2c Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master'
Unsubscribe from thread through link in email footer

Closes #3437 

![Screenshot_from_2015-12-11_15-35-06](/uploads/cfb3d8737d4757f527995411f103d0ce/Screenshot_from_2015-12-11_15-35-06.png)

![Screenshot_from_2015-12-11_15-35-56](/uploads/9b7121be7ce4b05e5995ca6d38c5bea4/Screenshot_from_2015-12-11_15-35-56.png)

See merge request !2068
2016-01-14 14:38:55 +00:00
Dmitriy Zaporozhets 33ccee239e Merge branch 'new-buttons-everywhere' into 'master'
Standartize buttons and fields size

Fixes #8069 and #8070

See merge request !2428
2016-01-14 14:19:32 +00:00
Douglas Barbosa Alexandre 2450916dc6 Fix parse_gollum_tags matcher 2016-01-14 12:09:31 -02:00
Douglas Barbosa Alexandre ac2c86055e Update documentation on Banzai::Filter::GollumTagsFilter 2016-01-14 12:09:31 -02:00
Douglas Barbosa Alexandre a8c836c371 Add tests for the wiki pipeline 2016-01-14 12:09:31 -02:00
Douglas Barbosa Alexandre 765a2c7327 Refactoring Banzai::Filter::GollumTagsFilter 2016-01-14 12:09:31 -02:00
Douglas Barbosa Alexandre 89e8b82b63 Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatter 2016-01-14 12:09:31 -02:00
Douglas Barbosa Alexandre ca87bb652a Remove GollumTagsPipeline 2016-01-14 12:09:31 -02:00
Douglas Barbosa Alexandre 60f8434a9d Refactoring Gitlab::GithubImport::Importer 2016-01-14 12:09:31 -02:00
Douglas Barbosa Alexandre 364e63fa2f Remove unnecessary brackets on WIKI_SLUG_ID route constraints 2016-01-14 12:09:31 -02:00
Douglas Barbosa Alexandre 928c94807e Move js function to removing accents to vendor/assets/javascripts 2016-01-14 12:09:31 -02:00
Douglas Barbosa Alexandre 7067c5fd6d Update CHANGELOG 2016-01-14 12:09:31 -02:00
Douglas Barbosa Alexandre 4872b319c8 Use the WikiPipeline when rendering the wiki markdown content 2016-01-14 12:09:31 -02:00
Douglas Barbosa Alexandre a6a5990ee5 Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTML 2016-01-14 12:09:31 -02:00
Douglas Barbosa Alexandre aac6598482 Relax constraints for wiki slug
Since GitHub doesn’t apply these constraints to theirs wiki slug
allowing characters like `,`, `:`, `*`, etc, we need to relax our
constraints or some wiki pages will not be available after they were
imported.

For an example the Devise project have a wiki page with the following
slug: “How To: Add sign_in, sign_out, and sign_up links to your layout
template”
2016-01-14 12:09:31 -02:00
Douglas Barbosa Alexandre 78f5eb94fb Import GitHub wiki into GitLab 2016-01-14 12:09:31 -02:00
Tomasz Maczukin 2c7d9cfa7d Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatus 2016-01-14 14:59:04 +01:00
Rémy Coutable 1b08cd811a Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into add-pagination-headers-to-api 2016-01-14 14:23:42 +01:00
Rémy Coutable c31d777c8f Revert changes to how the notes are paginated in the API 2016-01-14 14:20:21 +01:00
Dmitriy Zaporozhets e47f0e563d Merge branch 'closing-mr-bug-fix' into 'master'
fixes bug with commenting on merge requests



See merge request !2415
2016-01-14 13:14:50 +00:00
Dmitriy Zaporozhets 620d8b68a1 Merge branch 'remove-gray-bg'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-14 14:09:49 +01:00
Dmitriy Zaporozhets f414928a54 Standartize buttons and fields size
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-14 13:59:28 +01:00
Grzegorz Bizon f03da18e3a Merge branch 'ci/view-build-artifacts' into 'master'
Add browser for build artifacts

Discussion in #3426, closes #3426.

See merge request !2123
2016-01-14 12:57:33 +00:00