home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 11:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,666 Commits 48 Branches 340 Tags
91f2d3c22918d62a22ff76ec72fddd0a0d672b79
Commit Graph
16666 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeroen van Baarsen 91f2d3c229 Merge pull request #9335 from stefan-it/documentation/timezone-clarifications 
[Documentation] non-omnibus instructions for changing time zone
 2015-05-28 10:46:18 +02:00
Jeroen van Baarsen 5322099464 Merge pull request #9184 from rumpelsepp/english 
Some language improvements
 2015-05-28 10:43:41 +02:00
Dmitriy Zaporozhets 72e410965d Merge branch 'rs-persist-tab-selection' into 'master' 
Persist current merge request tab selection via URL

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

See merge request !728
 2015-05-28 07:49:15 +00:00
Dmitriy Zaporozhets 72f1889825 Merge branch 'header-icons' into 'master' 
Change some header icons

icons changed:

* profile settings: user icon to cog
* admin area: cogs to wrench

Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/719#note_1289290

![Screenshot_2015-05-27_17.58.12](https://gitlab.com/gitlab-org/gitlab-ce/uploads/762de4afb8ae229a96ead8b2d213b2a4/Screenshot_2015-05-27_17.58.12.png)

See merge request !726
 2015-05-28 07:47:14 +00:00
Marin Jankovski 492249f934 Merge branch 'rs-no-killers-in-development' into 'master' 
Disable Unicorn::WorkerKiller in non-production environments

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2281

See merge request !729
 2015-05-28 07:28:19 +00:00
Robert Speicher 694743170c Disable Unicorn::WorkerKiller in non-production environments 2015-05-27 22:57:49 -04:00
Robert Speicher 5c52eaa9d2 Persist current merge request tab selection via URL 
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350
 2015-05-27 22:39:11 -04:00
Douwe Maan 13f2ab3e3d Merge branch 'rs-dont-follow-me' into 'master' 
Add ExternalLinkFilter to Markdown pipeline

Forces a `rel="nofollow"` attribute on all external links.

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2314#note_46525

See merge request !727
 2015-05-27 20:26:44 +00:00
Stefan Tatschner 2fa3af047e Some language improvements 2015-05-27 21:44:04 +02:00
Robert Speicher 7424d2fa5b Add ExternalLinkFilter to Markdown pipeline 
Forces a `rel="nofollow"` attribute on all external links.
 2015-05-27 15:39:08 -04:00
Dmitriy Zaporozhets c843e092f3 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-27 18:29:35 +02:00
Dmitriy Zaporozhets accdcdf867 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-27 18:29:29 +02:00
Dmitriy Zaporozhets 6cf45dde0c Replace some icons in header 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-27 17:56:36 +02:00
Douwe Maan b222f211c1 Merge branch 'browse-milestone-issues' into 'master' 
Fix milestone "Browse Issues" button.

After refactoring around issue/merge requests filters, the button stopped working :(

See merge request !699
 2015-05-27 15:31:52 +00:00
Douwe Maan e46849c454 Merge branch 'fix-disabled-project-snippet-feature' into 'master' 
Fix project snippets button appearing when it is disabled

There was a typo in 9bcd36396b that caused the project snippets option to be shown when it is disabled.

Closes #1705

See merge request !720
 2015-05-27 15:31:22 +00:00
Douwe Maan 97f9d601cc Merge branch 'fix-safari-clone-url' into 'master' 
Fix clone URL losing selection after a single click in Safari and Chrome

### What does this MR do?

This MR deactivates the mouseup event in the `git clone` URL to prevent the text from being deselected after a single click.

### Why was this MR needed?

In Safari and Chrome 43.0.2357.65 (42.0.2311.152 worked fine), the URL would lose selection after a single click. To reproduce:

1. Go to https://gitlab.com/gitlab-org/gitlab-ce
2. Click on the URL in the repository (HTTP is selected by default).
3. Click on the SSH button.
4. Click on the URL again.

The URL selection should be selected automatically, but it is deselected immediately.

It appears that 92544df changed the selection event from `click` to `focusin` to make copy & paste work in X11. This Stack Overflow article discusses the deselection issue in detail:

http://stackoverflow.com/questions/3380458/looking-for-a-better-workaround-to-chrome-select-on-focus-bug

### What are the relevant issue numbers?

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

See merge request !698
 2015-05-27 12:26:41 +00:00
Douwe Maan e6f282e0f1 Fix spec. 2015-05-27 14:23:04 +02:00
Douwe Maan 7a11ef3e95 Add Browse Issues button to Dashboard and Group milestones. 2015-05-27 14:23:04 +02:00
Douwe Maan 511791014e Fix milestone "Browse Issues" button. 2015-05-27 14:23:04 +02:00
Douwe Maan 45e4727f97 Set milestone on new issue when creating issue from index with milestone filter active. 2015-05-27 14:22:11 +02:00
Douwe Maan 106cb511de Merge branch 'support-file-attachments-milestones' into 'master' 
Add file attachment support in Milestone description

### What does this MR do?

This MR adds support for attaching files to Milestone descriptions.

### Why was this MR needed?

Dropzone support should be in every Markdown area. It seems that this one was overlooked.

### What are the relevant issue numbers?

Closes #1648

See merge request !712
 2015-05-27 12:17:34 +00:00
Stan Hu ab88b7da19 Fix project snippets button appearing when it is disabled 
Closes #1705
 2015-05-27 05:07:44 -07:00
Stefan Schweter 8313aa6da8 Adds new section for changing time zone in GitLab configuration file. New section added for changing time zone in Omnibus installations. 2015-05-27 14:06:40 +02:00
Dmitriy Zaporozhets 284664448f Add missing CHANGELOG item 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-27 13:53:53 +02:00
Dmitriy Zaporozhets 4146ce559e Merge branch 'profile-in-sidebar' into 'master' 
Move user avatar and logout button to sidebar

Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/2272

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

See merge request !719
 2015-05-27 11:52:53 +00:00
Dmitriy Zaporozhets fcc0ff2ccd Merge branch 'nav-settings' into 'master' 
Clarify navigation labels for Project Settings and Group Settings.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2337.

See merge request !703
 2015-05-27 11:48:33 +00:00
Dmitriy Zaporozhets 2cd1cee639 Merge branch 'commit-graphs-by-email' into 'master' 
Group project contributions by both name and email.

See https://twitter.com/Argorain/status/598751646143897600.

We now group by both name and email, so that "Douwe Maan - douwe@gitlab.com", "Douwe Maan - me@douwe.me" and "Douwe M. - me@douwe.me" are all combined into one graph.

Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2328.

See merge request !700
 2015-05-27 11:45:53 +00:00
Dmitriy Zaporozhets 464123b388 Merge branch 'emailsonpush-prefix' into 'master' 
Prefix EmailsOnPush email subject with `[Git]`.

Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2112.

See merge request !701
 2015-05-27 11:45:14 +00:00
Dmitriy Zaporozhets 93b2a30c79 Merge branch 'point-to-gitlab-com' into 'master' 
Point people to the issue tracker on GitLab.com to prevent duplication.

/cc @jeroenvanbaarsen

See merge request !713
 2015-05-27 11:43:57 +00:00
Dmitriy Zaporozhets 9eec0d5436 Merge branch 'accepted-rejected-mrs' into 'master' 
Add Accepted and Rejected tabs to MR lists.

Before, MRs were referred to as Merged or Closed, but the Merge button on the MR page read "Accept Merge Request", the activity feed even read "X accepted merge request Y", and the Closed tab on the MR index included both Merged _and_ Closed MRs. I've changed every occurrence to consistently refer to MRs as either Accepted or Rejected, which is less technical and more clearly two opposites.

![Screen_Shot_2015-05-25_at_17.02.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b0bf43aa1b5b9898a1c6b204dbcf669a/Screen_Shot_2015-05-25_at_17.02.31.png)

![Screen_Shot_2015-05-25_at_17.02.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2ac05b1e1dba3b2d1692bd9242078f3a/Screen_Shot_2015-05-25_at_17.02.47.png)

![Screen_Shot_2015-05-25_at_17.03.03](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4c0f0fa869c9130a6af18d80a1c6ebed/Screen_Shot_2015-05-25_at_17.03.03.png)

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2201.

See merge request !702
 2015-05-27 11:40:36 +00:00
Dmitriy Zaporozhets 56ab471f98 Move user avatar and logout button to sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-27 13:17:14 +02:00
Dmitriy Zaporozhets 701c2e9a3b Merge branch 'rs-to_reference' into 'master' 
Add to_reference method to referable models

Now there is a single source of information for which attribute a model uses to be referenced, and its special character.

See merge request !641
 2015-05-27 10:03:14 +00:00
Dmitriy Zaporozhets 3ed05b2191 Merge branch 'rs-manual-2fa-entry' into 'master' 
Add support for manually entering 2FA details

> ![Screen_Shot_2015-05-22_at_6.39.26_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/27b6cc0b2f88e0ccec234dd8d20db957/Screen_Shot_2015-05-22_at_6.39.26_PM.png)

Related to #1679 though I'm not sure if it entirely fixes it, since I don't have access to a Windows Phone.

See merge request !694
 2015-05-27 09:53:40 +00:00
Marin Jankovski 1dbfecb2bb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-05-27 11:18:10 +02:00
Douwe Maan 29290dbb34 Merge branch 'rs-title-change-note' into 'master' 
Add a note when an Issue or Merge Request's title changes

> ![Screen_Shot_2015-05-26_at_9.40.19_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f05c6a7b9f489ce66560cfe724184ec9/Screen_Shot_2015-05-26_at_9.40.19_PM.png)

Closes #1434

See merge request !717
 2015-05-27 08:28:56 +00:00
Robert Speicher 38637e7d08 Change one-character variable name 
[ci skip]
 2015-05-27 03:34:14 -04:00
Douwe Maan 62d0ce19ed Merge branch 'fix-hipchat-default-api-version' into 'master' 
Allow HipChat API version to be blank and default to v2

### What does this MR do?

This MR fixes a regression introduced in v7.11 that requires a HipChat API version to be specified when it is supposed to be optional.

### Why was this MR needed?

The "optional" HipChat API version in 57c724558 passed in a blank `api_version` when nothing was specified, and the code was not tested. This would cause a 500 Error.

### What are the relevant issue numbers?

Closes #772

See merge request !718
 2015-05-27 07:27:03 +00:00
Jeroen van Baarsen 8044b4d278 Merge branch 'master' into 'master' 
ADD: Note on how to setup dns hostname resolution to installation manual

Hi,

I'm suggesting to add the following note to the installation instructions. It took me some time to figure out why the test failed and why I wasn't able to push. The error messages did not point into the right direction so this might help other people with the same problems.

I hope my english is good enough, if not, please feel free to rephrase anything.

Thank you in advance,

Holger Segnitz

See merge request !236
 2015-05-27 07:11:44 +00:00
Stan Hu 0c9463174b Allow HipChat API version to be blank and default to v2 
Closes #772
 2015-05-26 21:57:24 -07:00
Robert Speicher 1aa3921dd8 Add a note when an Issue or Merge Request's title changes 2015-05-26 21:49:04 -04:00
Patricio Cano cf12da0653 Added v7.4.4 and .5 to the CHANGELOG 2015-05-27 01:04:23 +00:00
Robert Speicher cc0f223858 Merge branch 'fix-typo-in-email' into 'master' 
Fix "Asignee" typo in new issue/merge request emails

See merge request !676
 2015-05-26 21:47:04 +00:00
Robert Speicher 3cb6a33846 More SystemNoteService cleanup 2015-05-26 16:30:07 -04:00
Robert Speicher 2c1bf71793 Fix ClosingIssueExtractor specs 2015-05-26 15:55:26 -04:00
Robert Speicher 5a9c5520d9 Make use of to_reference in more specs 2015-05-26 15:49:22 -04:00
Robert Speicher 68f74aa826 Add a note about the commented-out test in Markdown Feature 2015-05-26 15:49:22 -04:00
Robert Speicher 1a9da9178c Surround Project.reference_pattern in parenthesis inside other patterns 2015-05-26 15:49:22 -04:00
Robert Speicher 5cc9b17b8a Make cross_project_reference? less magical 2015-05-26 15:49:21 -04:00
Robert Speicher 81a09bc74c Support only double quotes for multi-word label references 2015-05-26 15:49:20 -04:00
Robert Speicher 35853033b9 Fix for Snippets with a project 2015-05-26 15:48:32 -04:00