home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 15:16:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,335 Commits 48 Branches 340 Tags
d63371ad783db055da840be37ddac0cdcb49db2c
Commit Graph
1019 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 2d31568b27 Refactor issue and merge request sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 16:04:50 +02:00
Robert Speicher 09f2bec64c Prefix random Markdown tips with "Tip:" 2015-06-24 18:43:57 -04:00
Robert Speicher 82a671704d Show a random Markdown tip in the textarea placeholder 2015-06-23 21:00:10 -04:00
Rowan Wookey cacc955acc Fixed invalid timestamps in RSS feed #1771 2015-06-23 11:32:26 +01:00
Dmitriy Zaporozhets cc9b5c49d1 Merge branch 'revert-mr-state-names' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/merge_requests.rb
 2015-06-22 15:43:09 +02:00
Dmitriy Zaporozhets 595b3323a8 Merge branch 'rs-rspec3' into 'master' 
RSpec3

Upgrades rspec to 3.3.0, we're now up-to-date! 🎉

See merge request !831
 2015-06-22 13:15:27 +00:00
Dmitriy Zaporozhets 6c4d48b8b9 Merge branch 'rs-remove-link-to-override' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/helpers/application_helper_spec.rb
 2015-06-22 12:26:41 +02:00
Dmitriy Zaporozhets 9179dc6dc8 Merge branch 'new-logo' into 'master' 
Replace old logo with new one

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

cc @JobV @sytses

See merge request !848
 2015-06-22 10:18:51 +00:00
Robert SpeicherandDmitriy Zaporozhets 5a9ede4721 Update mock and stub syntax for specs 2015-06-22 12:13:46 +02:00
Dmitriy Zaporozhets 7524d7c082 Revert merge request states renaming 
Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 17:09:50 +02:00
Dmitriy Zaporozhets f5e0e5c0a3 Replace old logo with new one 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 16:59:16 +02:00
Robert Speicher 54365ecc7a Remove overridden link_to helper 
The purpose for this override is now handled by `ExternalLinkFilter`.
 2015-06-17 17:23:16 -04:00
Robert Speicher 8c8cd8be43 Update time_ago_with_tooltip helper 
Minor refactoring, add specs, changes arguments to use keywords.
 2015-06-17 16:37:10 -04:00
Stan Hu a7932fe2fd Support commenting on a diff in side-by-side view 
Closes https://github.com/gitlabhq/gitlabhq/issues/9283
 2015-06-16 06:11:59 -07:00
Robert Speicher d2894a39e5 Refactor dashboard_choices 2015-06-13 17:59:13 -04:00
Robert Speicher fb5271ddf1 Make the dashboard choice text match the text in the sidebar 2015-06-13 17:59:12 -04:00
Robert Speicher 1eb9a02f21 Add a form field to customize the dashboard preference 2015-06-13 17:59:11 -04:00
Robert Speicher 8112f7550b Add PreferencesHelper module 
Consolidates the helpers related to user preferences.

Renames `app_theme` to `user_application_theme` to better explain what
it is.
 2015-06-13 17:58:16 -04:00
Robert Speicher 844d72716e Add Gitlab::Themes module; remove Gitlab::Theme 
Now we can simply loop through all themes, among other things.

This also removes the `dark_theme` / `light_theme` classes and the
`theme_type` helper, since they weren't used anywhere.
 2015-06-13 17:58:16 -04:00
Nicolas ebe4963871 Move Project Members link from Settings to main menu. 
Addresses #2278.
 2015-06-09 14:45:38 +02:00
Dmitriy Zaporozhets 79aac2c128 Merge branch 'ignore-references' into 'master' 
Don't notify users mentioned in code blocks or blockquotes.

cc @rspeicher

See merge request !753
 2015-06-02 18:39:18 +00:00
Robert Speicher 1a52f19c45 Remove now-unused escaped_autolink helper and rails_autolink gem 2015-06-02 13:04:10 -04:00
Douwe Maan fe78984f20 Actually ignore references in code blocks etc. 2015-06-02 13:17:11 +02:00
Douwe Maan a675bea2c1 Merge branch 'rs-issue-1721' into 'master' 
Fix link_to_gfm with only a reference having the incorrect link

Before:

```ruby
link_to_gfm("#4", "/foo")     # => "<a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>"
link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>"
```

After:

```ruby
link_to_gfm("#4", "/foo")     # => "<a href="/foo">#4</a>"
link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>"
```

Closes #192
Closes #1721
Closes [GitHub #7115](https://github.com/gitlabhq/gitlabhq/issues/7115)

See merge request !739
 2015-06-02 08:56:53 +00:00
Dmitriy Zaporozhets a3b60982e5 Merge branch 'leave-project' into 'master' 
Add ability to leave project

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

See merge request !744
 2015-05-29 15:10:46 +00:00
Dmitriy Zaporozhets 2afa5fcb52 Add ability to leave project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-29 16:23:36 +02:00
Douwe Maan 96d6fdc27c Add option to disallow users from registering any application to use GitLab as an OAuth provider 2015-05-29 13:29:16 +02:00
Robert Speicher 5733bdb7c7 Fix link_to_gfm with only a reference having the incorrect link 
Closes #1721
 2015-05-29 04:46:14 -04:00
Stan Hu 0cd73885e6 Fix git blame syntax highlighting when different commits break up lines 
Closes #1521
 2015-05-27 14:10:58 -07: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
Robert Speicher 38fb6279f9 Simplify cross_project_reference with to_reference 2015-05-26 15:48:31 -04:00
Dmitriy Zaporozhets b5ea355078 Merge branch 'rs-link_to_label' into 'master' 
Add link_to_label helper

The primary purpose of this change was to make the actual labels on `Labels#index` clickable.

See merge request !690
 2015-05-26 15:09:04 +00:00
Stan Hu 9bcd36396b Refactor permission checks to use can? instead of issues_enabled and merge_requests_enabled 2015-05-25 16:51:04 -07:00
Douwe Maan d25026a512 Add Accepted and Rejected tabs to MR lists. 2015-05-25 17:01:27 +02:00
Stan Hu 7a7ce70169 Use the user list from the target project in a merge request 
Closes #1535
 2015-05-22 09:52:09 -04:00
Robert Speicher 9bdd7f34a5 Add link_to_label helper 2015-05-21 23:40:25 -04:00
Job van der Voort 3a3f4b41e6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-21 10:38:22 +02:00
Alex ConnorandJeroen van Baarsen 3c892f3554 Disabled expansion of top/bottom blobs for new file diffs 2015-05-21 09:25:07 +02:00
Hannes Rosenögger dfce7b62f7 workaround for buggy lexers 
if something goes wrong, fall back to the plaintext lexer
 2015-05-20 16:16:27 +02:00
Jakub Jirutka b0659c1b07 Simplify and unify helpers for rendering markup 2015-05-18 22:52:13 +02:00
Jakub Jirutka daa0925016 Rename MarkdownHelper to MarkupHelper 2015-05-18 22:51:56 +02:00
Jakub Jirutka 8dbc4746fe Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263) 2015-05-18 20:48:03 +02:00
Vinnie Okada af428b1259 Fill in email on the new password form 2015-05-16 14:03:18 -06:00
Vinnie Okada 0bfab084a8 Explain reset token expiration in emails 
Tell new users when their password reset token expires and provide a
link to get a new one.
 2015-05-16 14:03:07 -06:00
Dmitriy Zaporozhets 07fd736d2e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-15 12:59:44 +03:00
Dmitriy Zaporozhets 9c6f4a2351 Merge branch 'dashboard-references' into 'master' 
Fix reference links in dashboard activity and ATOM feeds.

References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations.

This MR passes the project in question to the reference parsers in an option.

cc @rspeicher

See merge request !653
 2015-05-15 09:59:26 +00:00
Jorge Vasquez dfb58234a1 Fix bug with default timezone en RSS gitlab events 2015-05-14 15:30:55 -04:00
Dmitriy Zaporozhets ded82ed4c9 Small refactoring of state_filters_text_for helper 2015-05-14 18:34:06 +03:00
Dmitriy Zaporozhets 40f381e652 append empty space only if count exists 2015-05-14 18:32:07 +03:00
Dmitriy Zaporozhets 3d4d89f060 Use count badges with number_with_delimiter helper for issue, commit count 2015-05-14 18:30:23 +03:00