Commit Graph
15017 Commits
Author SHA1 Message Date
Vinnie Okada 1dc90fc455 Fix nested task lists
When nesting task list items, the parent item is wrapped in a `<p>` tag.
Update the task list parser to handle these paragraph wrappers.
2015-03-21 08:45:28 -06:00
Marin Jankovski c6dd117c71 Revert "Merge branch 'new_branch' into 'master'"
This reverts commit 00607d4f96, reversing
changes made to edfc7d0d26.
2015-03-19 23:52:33 -07:00
Marin Jankovski 00607d4f96 Merge branch 'new_branch' into 'master'
New branch

See merge request !406
2015-03-20 06:50:14 +00:00
Marin Jankovski 189dc4dc81 REaadme. Issue #1 2015-03-19 23:49:49 -07:00
Dmitriy Zaporozhets edfc7d0d26 Merge pull request #8974 from duduribeiro/add_error_message_in_profile
Add error message when have error on profile screen
2015-03-19 22:53:33 -07:00
Carlos Ribeiro 2435476167 Add error message when have error on profile screen 2015-03-19 23:31:25 -03:00
Dmitriy Zaporozhets b99221e6f0 Merge branch 'revert-unicorn-timeout' into 'master'
Revert "Increase timeout for Git-over-HTTP requests."

This reverts commit 516bcabbf4.

For #2164

cc @marin @douwe

See merge request !1730
2015-03-20 02:01:38 +00:00
Dmitriy Zaporozhets d5a259d43e Revert "Update poltergeist to support phantomjs 2.0"
This reverts commit d70126c1fb.
2015-03-19 18:56:05 -07:00
Dmitriy Zaporozhets efd8491d49 Revert "Increase timeout for Git-over-HTTP requests."
This reverts commit 516bcabbf4.

Conflicts:
	Gemfile
2015-03-19 18:29:20 -07:00
Dmitriy Zaporozhets 915c7b9455 Merge branch 'update_ui' into 'master'
Remove mention of branch to commit to when new file is added through UI

See merge request !1731
2015-03-20 01:28:47 +00:00
Dmitriy Zaporozhets 479020ec6b Fix project issues and merge requests pages 2015-03-19 18:27:26 -07:00
Dmitriy Zaporozhets 0ec1c8eea9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-19 17:54:10 -07:00
Dmitriy Zaporozhets ad2720aea8 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-19 17:53:48 -07:00
Marin Jankovski a879d93378 Remove mention of branch to commit to. 2015-03-19 17:43:21 -07:00
Dmitriy Zaporozhets 00c042ea7c Merge pull request #8772 from awiddersheim/fix/grammar_projects_show
Fix small grammar issue on projects show page
2015-03-19 16:17:37 -07:00
Dmitriy Zaporozhets df8b4ab459 Merge pull request #8662 from yglukhov/mr-and-issue-links
Make MR and issue numbers clickable links in MR and issue lists.
2015-03-19 15:17:07 -07:00
Hannes Rosenögger 623f6c5f09 Merge branch 'fix-underscore-notes' into 'master'
Fix cross-references that contain underscores

### What does this MR do?

Cross-references that contain underscores confuse the Markdown renderer and don't work properly. For example:

1. In  `myacct/project_one#456`, add a comment that includes a reference to `myacct/project_two#123`.
2. The comment in `myacct/project_one#456` links correctly.
3. The system note in `myacct/project_two#123` is incorrectly linked as:

`mentioned in issue myacct/projectone#456_`

This MR removes the use of the `_` character in the system notes to prevent Markdown confusion.

See a full discussion in #1160.

### Are there points in the code the reviewer needs to double check?

To preserve backwards compatibility with existing system notes, there is a SQL wildcard match for notes having underscores. This seemed safer than migrating all notes.

### Why was this MR needed?

In an ideal world, the Markdown parser would be able to handle references containing underscores with or without escape sequences. However, there are a number of issues:

1. RedCarpet's parser for emphasis block is pretty dumb: it treats `#` as a word break and thus even the `intra_word_emphasis` flag has no effect.
2. The parser is in C and can't be changed easily.
3. There is no way to insert an escape sequence for emphasis blocks.

The only way around this is to switch to something like CommonMark, which does support escape sequences.

### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?

Issue #1160

### Screenshots

Before:

![Screen_Shot_2015-03-19_at_1.39.29_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a1db4b96c0df2f10d9855ed5abe976ca/Screen_Shot_2015-03-19_at_1.39.29_AM.png)

After:

![Screen_Shot_2015-03-19_at_1.39.35_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/189a062c2d19645eec1782ac1f0d4f2f/Screen_Shot_2015-03-19_at_1.39.35_AM.png)

See merge request !385
2015-03-19 21:20:45 +00:00
Dmitriy Zaporozhets 012411817b Merge branch 'version-bump-poltergeist' into 'master'
Update poltergeist to support phantomjs 2.0

In response to [my issue](https://gitlab.com/gitlab-org/gitlab-development-kit/issues/36) on the GDK.
PhantomJS 1.8 was not in the repo's anymore. Only poltergeist needed it, but they support PhantomJS 2.0 since 1.6.0. (next release since 1.5.1) [Their CHANGELOG](https://github.com/teampoltergeist/poltergeist/blob/master/CHANGELOG.md).

Tested locally with Ruby 2.1.5. As this took ages, I haven't tested further.

See merge request !403
2015-03-19 21:12:08 +00:00
Dmitriy Zaporozhets 14846c044a Merge branch 'bugfix/block_ldap_users_cronjob' into 'master'
Fixed rake task gitlab:cleanup:block_removed_ldap_users

Maybe not the most elegant solution, but it works for us.

This closes issue gitlab-org/gitlab-ce#955.

See merge request !338
2015-03-19 21:09:25 +00:00
Dmitriy Zaporozhets 82d4760d0d Merge branch 'import-button' into 'master'
Move "Import existing repository by URL" option to button.

The "Import existing repository URL" (with or without form visible) looked out place with the new import buttons. I moved it to a button, and moved the form to below the buttons.

@dzaporozhets Would be nice to have in 7.9 since the moved buttons are in there as well.

Before:

![Screen_Shot_2015-03-19_at_15.08.04](https://dev.gitlab.org/gitlab/gitlabhq/uploads/6ac26467ede65a4f31d004c227fdbc3e/Screen_Shot_2015-03-19_at_15.08.04.png)

After:

![Screen_Shot_2015-03-19_at_15.42.56](https://dev.gitlab.org/gitlab/gitlabhq/uploads/a73bd7d09b7a33f58067a3bd0d7f604a/Screen_Shot_2015-03-19_at_15.42.56.png)

("publically" typo has been fixed to "publicly")

See merge request !1728
2015-03-19 19:03:43 +00:00
Dmitriy Zaporozhets 476199e069 Merge branch 'add_canceled_ci_status' into 'master'
Add canceled CI status

Fixes https://github.com/gitlabhq/gitlab-ci/issues/564

https://dev.gitlab.org/gitlab/gitlab-ci/issues/169

![Screen_Shot_2015-03-19_at_17.10.08](https://dev.gitlab.org/gitlab/gitlabhq/uploads/87f47d9fd1b1a60e0c5402eedd1a1566/Screen_Shot_2015-03-19_at_17.10.08.png)

See merge request !1729
2015-03-19 17:21:20 +00:00
Valery Sizov 19032c0319 add canceled CI status 2015-03-19 18:27:24 +02:00
Dmitriy Zaporozhets 1fdf4508d4 Use same font for project description and star links 2015-03-19 09:12:11 -07:00
Dmitriy Zaporozhets 83982e9329 Merge branch 'fix/navbar-toggle-margin' into 'master'
fix(style): align navbar-toggle

Changes:
- change `.navbar-toggle` from `margin: 0 -15px 0 0;` to `margin: 0;`

## Before:
- 320x480 ![Screen_Shot_2015-03-19_at_03.43.53](https://gitlab.com/kingcody/gitlab-ce/uploads/376727af07cf62eec5609c01bbbdaacf/Screen_Shot_2015-03-19_at_03.43.53.png)

- 360x640 ![Screen_Shot_2015-03-19_at_03.44.04](https://gitlab.com/kingcody/gitlab-ce/uploads/d5318de4f45687154d90c54f0bece2aa/Screen_Shot_2015-03-19_at_03.44.04.png)

## After:
- 320x480 ![Screen_Shot_2015-03-19_at_03.45.21](https://gitlab.com/kingcody/gitlab-ce/uploads/20f526c9ef19c2c30add001b15c06358/Screen_Shot_2015-03-19_at_03.45.21.png)

- 360x640
![Screen_Shot_2015-03-19_at_03.45.27](https://gitlab.com/kingcody/gitlab-ce/uploads/e60e9dde1f86d89adf36480e7fcc611d/Screen_Shot_2015-03-19_at_03.45.27.png)

See merge request !402
2015-03-19 16:04:12 +00:00
Dmitriy Zaporozhets 8b723776ac Merge branch 'fix_trigger_search' into 'master'
Only trigger search if search string is present

This is a follow up for !296 to prevent the search function from being executed while the query is nil.

Problem was this:
When the search is called, the search controller gets 2 requests.
```
{"action"=>"show", "controller"=>"search"}
```
and
```
{"utf8"=>"✓",
 "search"=>"proj",
 "project_id"=>"",
 "group_id"=>"",
 "snippets"=>"",
 "scope"=>"",
 "button"=>"",
 "action"=>"show",
 "controller"=>"search"}
```

Obviously it doesn't make sense to execute the search for the first request, since that one doesn't have a scope or a search string.

Please review this carefully since this modifies the search and may break things i can't think of.

@dzaporozhets While this fixes the root cause for the failing test, I think we should keep your fix in as a failsafe. What do you think of this?

See merge request !302
2015-03-19 16:00:55 +00:00
Dmitriy Zaporozhets 479cf89270 Merge branch 'rake_backup' into 'master'
Backup repo with tar instead of git bundle

Fixes gitlab/gitlab-ee#246

See merge request !1723
2015-03-19 15:54:53 +00:00
Dmitriy Zaporozhets c8a7e4c6c1 Merge branch 'fewer-constants-more-helpres' into 'master'
Fewer Git constants, more Git helpers.

See merge request !1727
2015-03-19 15:53:43 +00:00
Dmitriy Zaporozhets c71fa13206 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-19 08:38:06 -07:00
Dmitriy Zaporozhets e94182434c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-19 08:37:56 -07:00
Dmitriy Zaporozhets b617455d2d Dont exit from brakeman rake task 2015-03-19 08:37:21 -07:00
Douwe Maan e23a1e448b Clear up import help. 2015-03-19 16:14:37 +01:00
Stan Hu fad71576f9 Fix cross references when usernames, milestones, or project names contain underscores.
Remove emphasis from system notes to avoid Markdown conflicts in names.
2015-03-19 07:07:30 -07:00
Douwe Maan b298758b44 Move "Import existing repository by URL" option to button. 2015-03-19 15:06:05 +01:00
Valery SizovandValery Sizov d411a9e4d8 backup repo with tar instead of git bundle 2015-03-19 14:36:02 +02:00
Robert Schilling 757368f3ad Merge pull request #8978 from sampi60/patch-1
Fix link to 'URL auto-linking' section in markdown help
2015-03-19 13:11:24 +01:00
Piotr Sampławski 81c06ee53c Fix link to URL auto-linking section in markdown help 2015-03-19 12:59:04 +01:00
Robert Schilling 69c8f24746 Merge pull request #8977 from rumpelsepp/rugments
Update rugments, fixes #8976
2015-03-19 12:54:24 +01:00
Stefan Tatschner 0a3b39d953 Update rugments, fixes #8976 2015-03-19 12:41:37 +01:00
Hannes Rosenögger fc4cda65bd Merge branch 'docs-spelling-error' into 'master'
Fixed spelling mistake in install docs

Fixed spelling mistake of this.

[ci skip]

See merge request !404
2015-03-19 10:02:56 +00:00
Phil Hughes 9ffef6ca1e Changed tis to this 2015-03-19 09:57:27 +00:00
Hannes Rosenögger 9487c37037 Only trigger actual search if a search string is present 2015-03-19 10:50:34 +01:00
Douwe Maan a5a5ec970e Fewer constants, more helpers. 2015-03-19 10:34:04 +01:00
kingcody 575ae80647 fix(style): align navbar-toggle
Changes:
- change `.navbar-toggle` from `margin: 0 -15px 0 0;` to `margin: 0;`
2015-03-19 05:14:50 -04:00
Zeger-Jan van de Weg d70126c1fb Update poltergeist to support phantomjs 2.0 2015-03-19 09:33:01 +01:00
Dmitriy Zaporozhets 6c1074e302 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-18 22:56:29 -07:00
Dmitriy Zaporozhets a5bfd568f0 Merge branch 'remove-signin-flash' into 'master'
Remove success signin message by devise

I find it really annoying every time I login into GitLab it shows me
that I successfully signed in. But this makes no sense to me. I already
see dashboard and dont see login screen. Its obvious I signed in
successfully. Instead it just show annyoing message every time taking
part of space on my screen.

See merge request !401
2015-03-19 05:56:02 +00:00
Dmitriy Zaporozhets 4595d5bf4a Merge branch 'show_test_settings_button' into 'master'
Show test settings as disabled when service cannot be tested.

See merge request !1725
2015-03-19 05:24:40 +00:00
Marin Jankovski 5aa97ce91b Show test settings as disabled when service cannot be tested. 2015-03-18 21:47:17 -07:00
Dmitriy Zaporozhets f3d5046196 Return compare code button to top of sidebar 2015-03-18 21:32:23 -07:00
Dmitriy Zaporozhets 64f5d6ddf0 Remove signout flash message because it also makes no sense.
You get redirected after signuout to gitlab.com and see this message on login page which makes no sense.
2015-03-19 04:26:36 +00:00