Commit Graph
8955 Commits
Author SHA1 Message Date
Robert Speicher 8714038410 Improve wording below signup box
[ci skip]
2015-04-07 17:46:00 -04:00
Robert Speicher b9069f31b9 Make the New Application form's error messages visible 2015-04-07 13:01:30 -04:00
Stan Hu 3143edfea6 Fix bug where Wiki pages that include a '/' were no longer accessible
Closes #1363
2015-04-07 09:10:11 -07:00
Robert Speicher f7190e428f Typo -- findAndollowLink -> findAndFollowLink 2015-04-07 11:03:48 -04:00
Dmitriy Zaporozhets 7d57d8b783 Merge branch 'rs-issue-2088' into 'master'
Lower the pointHitDetectionRadius for commit charts

Needed to update the Chart.js dependency as well.

Fixes #2088

See merge request !1749
2015-04-07 10:07:52 +00:00
Dmitriy Zaporozhets 7feec5fe05 Merge branch 'add-menu-icons' into 'master'
Add icons to Add dropdown items.

Before:

![Screen_Shot_2015-04-06_at_15.15.44](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a9f7d2e5dbd604fe7dff03cd7e47860e/Screen_Shot_2015-04-06_at_15.15.44.png)

After:

![Screen_Shot_2015-04-06_at_15.15.34](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c5be6cdbe32d1064da7497a1879a9eb3/Screen_Shot_2015-04-06_at_15.15.34.png)

See merge request !498
2015-04-07 09:55:48 +00:00
Dmitriy Zaporozhets 18dfe0ce76 Merge branch 'emailsonpush-last-line' into 'master'
Fix final line in EmailsOnPush email diff being rendered as error.

Fixes https://github.com/gitlabhq/gitlabhq/issues/8976 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2194.

Pulls in gitlab_git 7.1.5, which includes https://gitlab.com/gitlab-org/gitlab_git/merge_requests/18.

See merge request !480
2015-04-07 09:54:23 +00:00
Dmitriy Zaporozhets d21d5d2d72 Merge branch 'import-event' into 'master'
Add event to activity feed for imported projects.

![Screen_Shot_2015-04-06_at_14.51.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/07fd16cb558873d2a6fb6c3cfcfdb227/Screen_Shot_2015-04-06_at_14.51.16.png)

See merge request !496
2015-04-07 09:46:11 +00:00
Robert Speicher 5cc11cfcab Lower the pointHitDetectionRadius for commit charts
Fixes #2088
2015-04-07 00:37:05 -04:00
Robert Speicher 167a6b9eef Render a 404 when RefsController#logs_tree gets an HTML request
Fixes #2152
2015-04-06 23:08:28 -04:00
Valery Sizov bafec400f1 CI forking: tests 2015-04-06 19:45:16 +03:00
Douwe Maan cf0e84cf04 Add icons to Add dropdown items. 2015-04-06 15:13:50 +02:00
Douwe Maan ee9e922e96 Move project file links to tab bar. 2015-04-06 15:04:13 +02:00
Douwe Maan 4740242a67 Change text of project creation event for imports. 2015-04-06 14:51:41 +02:00
Douwe Maan e69e430ce7 Allow projects to be imported into namespaces user is master of. 2015-04-06 14:50:43 +02:00
Valery Sizov 9c2301808b CI project forking 2015-04-06 15:20:58 +03:00
Douwe Maan f2af30f195 Skip email confirmation when set by admin or via LDAP. 2015-04-06 13:27:19 +02:00
Ben Bodenmiller af4577d779 remove extra scrollbar on background jobs 2015-04-04 05:46:18 -07:00
Douwe Maan 45ca39e81b Merge remote-tracking branch 'github.com/master' 2015-04-04 14:23:32 +02:00
Douwe Maan e33ddfebf2 Refactor ClosingIssueExtractor. 2015-04-03 18:03:26 +02:00
Douwe Maan 9d647197da Don't require user to every gfm call. 2015-04-03 18:03:01 +02:00
Douwe Maan 04a42ce3f1 Merge branch 'custom-email-reply-to' into 'master'
Add ability to configure Reply-To address

### What does this MR do?

This MR adds configuration variable `email_reply_to` to make it possible to configure a custom Reply-To address other than the default `noreply@mydomain.com`.

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

#1305

See merge request !455
2015-04-03 15:14:04 +00:00
Drew Blessing aaacef47ff Merge branch 'fix-admin-project-urls' into 'master'
Link paths for http and ssh in the admin project show view are incorrect

The link paths for http and ssh in the admin project show view are incorrect. Clicking on them effectively reloads the page. I think the intent is to have the links point to the project dashboard.

Incorrect: http://gitlab.example.com/admin/projects/[namespace]/[project]
Correct: http://gitlab.example.com/[namespace]/[project]

See merge request !214
2015-04-03 15:09:30 +00:00
Douwe Maan 17e2310878 Add instructions to Google Code import page. 2015-04-03 16:02:39 +02:00
Stan Hu 81a5a9713d Add ability to configure Reply-To address in gitlab.yml
Closes #1305
2015-04-03 06:47:54 -07:00
Douwe Maan 7b5bc32cad Allow projects to be imported from Google Code. 2015-04-03 15:29:27 +02:00
Drew Blessing aedc12547a Merge branch 'issue-sidebar-size' into 'master'
Changes the width of sidebar in issues and MRs when affix event fires

Fixes #1320

Width is set when Bootstraps affix event is fired and then removed when it reaches the top or bottom.

See merge request !464
2015-04-03 13:23:11 +00:00
Douwe Maan ed097df627 Clean up code. 2015-04-03 12:28:47 +02:00
Douwe Maan edc4a56d26 Allow admin to create public deploy keys that are accessible to any project. 2015-04-03 12:23:20 +02:00
Sullivan SENECHALandSullivan SENECHAL d365004e68 Fix and improve help rendering 2015-04-03 11:56:50 +02:00
Douwe Maan 317206300d Merge branch 'configurable-attachment-size' into 'master'
Support configurable attachment size in Application Settings page

### What does this MR do?

This MR provides the ability to configure the maximum size of an attachment inside a note. A parameter has been added to the Application Settings page.

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

What should be done with the legacy note attachment validation? I added code to make the validation work with the configurable setting. I could see an issue where an admin lowers the limit from 10 megabytes to 5 megabytes, which could cause an existing model to be invalid.

### Why was this MR needed?

We often have attachments that exceed 10 MB, and it would be nice to be able to override the defaults.

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

See Issue #1258

### Screenshots

Before:

![Screen_Shot_2015-03-29_at_3.06.53_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6013a1dbc8cf61a63e93744149937fa0/Screen_Shot_2015-03-29_at_3.06.53_PM.png)

After:

![Screen_Shot_2015-03-29_at_3.12.34_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f3518af7e8653ba40f0a3579456da6ad/Screen_Shot_2015-03-29_at_3.12.34_PM.png)

See merge request !407
2015-04-03 08:47:55 +00:00
Douwe Maan c5d7660000 Fix errors. 2015-04-02 22:36:54 +02:00
Dmitriy Zaporozhets 0d0042d274 Merge branch 'import-current-user' into 'master'
Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user into current namespace.

Addresses #1347.

Untested since I'm in a bit of a hurry. Will definitely have time to test and add unit tests before the 7.10 release :)

See merge request !481
2015-04-02 20:34:52 +00:00
Dmitriy Zaporozhets 424cbf46d5 Merge branch 'repository-archive-worker' into 'master'
Archive repositories in background worker.

Depends on https://gitlab.com/gitlab-org/gitlab_git/merge_requests/17 being merged, a new `gitlab_git` being released and this MR's `Gemfile.lock` being updated..

See private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2173.

To do after this is merged: Update https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb in omnibus.

See merge request !436
2015-04-02 20:30:55 +00:00
Dmitriy Zaporozhets f8f9750323 Merge branch 'username-period' into 'master'
Don't allow username to end in period.

The current behavior doesn't do username referencing and mentioning in sentences like "I discussed with with @douwe." since `douwe.` is matched as a username.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2174.

See merge request !438
2015-04-02 20:28:23 +00:00
Douwe Maan 65bb0c3406 Only allow users to cross-reference and close issues they have access to. 2015-04-02 10:57:01 +02:00
Douwe Maan e62b5a2b07 Only allow user to see participants from groups they have access to. 2015-04-02 10:57:01 +02:00
Douwe Maan d9698628d9 Add Commit#author and #committer. 2015-04-02 10:57:01 +02:00
Douwe Maan 403b727138 Slightly refactor getting note notification recipients. 2015-04-02 10:57:01 +02:00
Douwe Maan d2bd606759 Refactor Mentionable mentioned users to use ReferenceExtractor. 2015-04-02 10:57:01 +02:00
Douwe Maan ca58e369c9 Only allow user to reference objects they have access to. 2015-04-02 10:56:04 +02:00
Douwe Maan b1ef1aa59f Slightly refactor ReferenceExtractor. 2015-04-02 10:53:38 +02:00
Stan Hu dfd256f29e Support configurable attachment size via Application Settings
Fix bug where error messages from Dropzone would not be displayed on the issues page

Closes #1258
2015-04-02 00:04:08 -07:00
Robert Speicher 6ab8275cd1 Check symlink mode as a String for file_type_icon_class
See https://gitlab.com/gitlab-org/gitlab_git/commit/8ae14bb84b94a2ec15f8a639fb82f0f55c77ad69
2015-04-01 23:34:33 -04:00
Dominik Sander eaf919ec7d Fix event-title max-width in the dashboard
For view port sizes between 1260px and 1200px pixels the event-title was
too wide, thus not truncated and got pushed into a second line.

100% - 174px was chosen as the max-width because 141px is the widest
.event-item-timestamp can get (with 'less than a minute ago') + 24px for
the avatar + 8px avatar margin + 1px to fit into the gap.
2015-04-02 00:01:08 +02:00
Sullivan SENECHAL 15fc957163 Bootlint integration 2015-04-01 21:33:22 +02:00
Marin Jankovski d77f333f9c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Conflicts:
	lib/gitlab/markdown.rb
2015-03-31 19:03:54 -07:00
Marin Jankovski 96d093e59a Merge branch 'email-full-url' 2015-03-31 19:00:59 -07:00
Dmitriy Zaporozhets c14c03a88f Merge branch 'rs-issue-1340' into 'master'
Unbind task item checkbox events and then rebind them

Fixes #1340

This issue was caused by this line: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/views/projects/issues/update.js.haml#L17

`new Issue()` gets called on every JS-based issue update, and all the binds in the constructor get re-applied without first unbinding the existing ones. Right now my fix is *only* for the checkbox events, and I suspect there are similar issues still present for other events.

See merge request !478
2015-04-01 01:33:03 +00:00
Dmitriy Zaporozhets dc3b4321ff Merge branch 'group-information-leak' into 'master'
Don't leak private group existence by redirecting from namespace controller to group controller.

See merge request !440
2015-04-01 01:01:38 +00:00