Commit Graph
22224 Commits
Author SHA1 Message Date
Douwe Maan d953f6927c Restore Leave button on dashboard groups page 2015-07-29 12:15:21 +02:00
Douwe Maan 05cca9342b Use URL helpers 2015-07-29 12:03:53 +02:00
Valery Sizov a06827bff9 Merge branch 'update_chnagelog' into 'master'
Update chnagelog



See merge request !1064
2015-07-29 09:30:20 +00:00
Valery Sizov 545f389910 update changelog 2015-07-29 12:28:50 +03:00
Valery Sizov 8bda433734 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-07-29 12:19:59 +03:00
Valery Sizov 81c71d2519 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-29 12:19:37 +03:00
Douwe Maan d64ae5363f Merge branch 'soft-launch-gitlab-git-http-server' into 'master'
Experimental support for gitlab-git-http-server

https://gitlab.com/gitlab-org/gitlab-git-http-server

This change introduces the GITLAB_GRACK_AUTH_ONLY environment
variable. When set, Grack requests to GitLab will only respond with
the user's GL_ID (if the request is OK) or an error. This allows
gitlab-git-http-server to use the main GitLab application as an
authentication and authorization backend.

If we like how this works we should drop the GITLAB_GRACK_AUTH_ONLY
variable at some point in the future.

See merge request !1915
2015-07-29 09:19:25 +00:00
Jacob Vosmaer c5aae30773 Set internal backup directory modes on create
This sidesteps problems with running 'chmod' on some CIFS mounts.
2015-07-29 11:18:55 +02:00
Daryl Chan e72a9685f3 Added tags to disable autocapitalize and autocorrect on login field
- Updated CHANGELOG
2015-07-29 15:42:52 +08:00
Stan Hu e6feb98773 Merge pull request #9341 from rumpelsepp/rouge
Switch back to rouge gem for synthax highlighting
2015-07-28 23:57:03 -07:00
Stefan TatschnerandStefan Tatschner f2d4672b38 Manually update rouge to 1.9.1
Since gollum-lib blocks rouge from updating, let's bump the version
manually. The fix has already been accepted upstream:
https://github.com/gollum/gollum-lib/commit/9c042ea0914a7714abbda9d89e234c8a79fba893
2015-07-29 08:32:00 +02:00
Stefan TatschnerandStefan Tatschner 00ff84d3c0 Add HTMLGitlab formatter
This custom formatter for rouge is needed to generate HTML output
specifically for gitlab. Since its usecase is mostly suitable for
gitlab it had been rejected upstream:
https://github.com/jneen/rouge/pull/268

Thanks a lot to @stanhu, @jneen and @tsigo for review!
2015-07-29 08:32:00 +02:00
Stefan TatschnerandStefan Tatschner f736721c5b Replace Rugments with Rouge
I have mainly created the rugments fork for the purpose of improving
gitlab's highlighting. Nowadays IMO it works way better than the old
highlight.js solution. But the development is stuck on my side because
of a couple of personal reasons:

  * I have finished my studies; last months I was writing my master
    thesis. So there was a huge time problem. I am sorry for that.

  * I had to move to Munich due to getting a (paid) job. Searching a
    flat here is horrible... :)

  * Last but not least, maintaining the same code base in two seperate
    projects is a mess.

I have decided to switch back to rouge due to several reasons:

  * In the beginning I was quite motivated, but since I start
    working on my new job next week, the best solution IMO is
    switching back to upstream rouge.

  * Rouge is continously improving:
    https://github.com/jneen/rouge/blob/master/CHANGELOG.md
    http://rouge.jneen.net/

  * There should be absolutely no regressions with this change. Most
    likely this pull request will almost fix some minor bugs.

  * One less gem in gitlab is a good thing. since Gitlab is quite a
    huge bundle of gems. Reducing complexity should be a major
    milestone.

Thanks a lot to @stanhu and @jneen for the review!
2015-07-29 07:40:58 +02:00
Robert Speicher 8c957b54f5 Fix setup/teardown for Markdown feature spec
Prior, CI seemed to be freezing after running these specs.
2015-07-29 00:06:52 -04:00
Robert Speicher 05f9a6a9c4 Update Markdown feature to allow for multiple pipelines 2015-07-28 18:56:27 -04:00
Robert Speicher 0673ca3681 Add RelativeLinkFilter section to Markdown fixture 2015-07-28 18:56:27 -04:00
Robert Speicher 590fca0f06 Move MarkdownFeature to its own support file
This file's about to get much bigger and this removes some of the extra
noise.
2015-07-28 18:56:26 -04:00
Robert Speicher b07df8b1b0 Make links inside ignored elements unique
This is to prevent false matches since the Autolink section uses
about.gitlab.com as well.
2015-07-28 18:56:26 -04:00
Robert Speicher 97cedc5d1b Break up SanitizationFilter feature specs 2015-07-28 18:56:26 -04:00
Robert Speicher 3cafa74387 Use aggregate_failures where appropriate 2015-07-28 18:56:26 -04:00
Robert Speicher 06478ef3ec Minor Markdown feature spec reorganization 2015-07-28 18:56:26 -04:00
Robert Speicher b07ecbb5e3 Simplify AutolinkFilter specs 2015-07-28 18:56:26 -04:00
Robert Speicher 40c32b26af Merge branch 'rs-issue-2107' into 'master'
Make `hr`s more visible in note bodies

Closes #2107

See merge request !1054
2015-07-28 22:12:35 +00:00
Robert Speicher 0f77d4095e Merge branch 'bitbucket-re-authorize' into 'master'
Fix bug causing Bitbucket importer to crash when OAuth application
had been removed.

Fixes gitlab-com/support-forum#241.

See merge request !1057
2015-07-28 21:57:44 +00:00
Stan Hu f8bfd065aa Fix extraneous version 2015-07-28 14:31:02 -07:00
Stan Hu 1894fc110c Merge branch 'fix-semaphore-build-failures' into 'master'
Change before(:all) -> let! to avoid leaking data across tests

Closes https://github.com/gitlabhq/gitlabhq/issues/9495

See merge request !1061
2015-07-28 20:44:24 +00:00
Stan Hu 5bdcef7b0b Change before(:all) -> let! to avoid leaking data across tests
Closes https://github.com/gitlabhq/gitlabhq/issues/9495
2015-07-28 13:06:13 -07:00
Stan Hu 02a15d616b Merge branch 'bump-gitlab-git-for-500-error' into 'master'
Upgrade gitlab_git to version 7.2.6 to fix 500 Error when creating network graphs

See merge request !1060
2015-07-28 17:06:27 +00:00
Stan Hu c22b4061c2 Upgrade gitlab_git to version 7.2.6 to fix Error 500 when creating network graphs
Closes #745
2015-07-28 16:47:30 +00:00
GitLab 16dcf356b5 Fix style points
To make Rubocop and Douwe happy
2015-07-28 18:04:57 +02:00
Douwe Maan b230335090 Show Leave button when you're the last owner, so that the error explains the reason 2015-07-28 17:52:38 +02:00
Douwe Maan 45acfdd32a Disable adding members from admin area when appropriate 2015-07-28 16:36:48 +02:00
Douwe Maan f9bcb9632c Add specific ability for managing group members 2015-07-28 16:32:15 +02:00
GitLab 6912f21e5c Send GL_ID to gitlab-git-http-server as JSON 2015-07-28 15:55:53 +02:00
Douwe Maan a784b996b3 Add project star and fork count, group avatar URL and user/group web URL attributes to API 2015-07-28 15:49:44 +02:00
Job van der Voort f21ac8f5c6 Merge branch 'timestamp-wikis' into 'master'
Added a timestamp to the wikis page just below the title

Now it looks like this:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/813f85496db915cf14ee223c8b15478f/image.png)



See merge request !1055
2015-07-28 13:47:25 +00:00
Job van der Voort 5efb58b09a Merge branch 'add-file' into 'master'
New document in GitLab Basics about adding new files



See merge request !1913
2015-07-28 13:43:30 +00:00
Job van der Voort 2f5359233d Merge branch 'doc-size' into 'master'
Added info about repo size

Because of tweet https://twitter.com/s_hulard/status/624160758335672320

See merge request !1912
2015-07-28 13:40:19 +00:00
Douwe Maan 42ebd902de Fix bug causing Bitbucket importer to crash when OAuth application had been removed. 2015-07-28 15:33:16 +02:00
GitLab ae9e5eea3c Handle missing @user during Git HTTP requests 2015-07-28 15:17:06 +02:00
Jacob Vosmaer d3305df7aa Experimental support for gitlab-git-http-server
https://gitlab.com/gitlab-org/gitlab-git-http-server

This change introduces the GITLAB_GRACK_AUTH_ONLY environment
variable. When set, Grack requests to GitLab will only respond with
the user's GL_ID (if the request is OK) or an error. This allows
gitlab-git-http-server to use the main GitLab application as an
authentication and authorization backend.

If we like how this works we should drop the GITLAB_GRACK_AUTH_ONLY
variable at some point in the future.
2015-07-28 14:33:19 +02:00
Douwe Maan 43d1188031 Merge branch 'fix-api-mr-notes-ordering' into 'master'
Return comments in created order in merge request API

Closes #1832

See merge request !985
2015-07-28 09:15:08 +00:00
Douwe Maan 4fae34d629 Merge branch 'fix-quotes-in-branch' into 'master'
Fix commit data retrieval when branch name has single quotes

Quotes in ref names need to be escaped properly in JavaScript.

Closes #1724

See merge request !1046
2015-07-28 09:13:52 +00:00
Valery Sizov 16ce1d2a5e Merge branch 'rs-issue-2010' into 'master'
Render Note field hints consistently for "new" and "edit" forms

- The "Edit" form didn't have Markdown hints.
- The "New" form had a paperclip icon for attachments, the "edit" form
  didn't.

Closes #2010

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2525

See merge request !1049
2015-07-28 06:17:23 +00:00
karen Carias 6b243dd138 fixed text 2015-07-27 21:53:55 -07:00
karen Carias d61433542e fixed details in document 2015-07-27 16:46:30 -07:00
Darby 30b2a95b4d Added a timestamp to the wikis page just below the title 2015-07-27 17:41:31 -04:00
Robert Speicher 12a913a93c Make hrs more visible in note bodies
Closes #2107
2015-07-27 17:32:56 -04:00
Jacob Vosmaer 0be6debb0b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-permissions 2015-07-27 11:22:35 +02:00
Job van der Voort cd6046e1dd Merge branch 'unique-ssh' into 'master'
Added note about SSH keys being unique

Because of issue https://gitlab.com/gitlab-com/support-forum/issues/143

See merge request !1914
2015-07-27 09:16:40 +00:00