home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 03:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,873 Commits 48 Branches 340 Tags
b80e81eb28a364490cedc348ce3c1559cd8185af
Commit Graph
5902 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 804b25956e Merge branch 'protect_default_branch_by_default' into 'master' 
Protect default branch by default

Fixes #1543

See merge request !1130
 2014-09-29 15:16:15 +00:00
Jacob Vosmaer 51f8352dca Keep tmp/repositories during clean-up 2014-09-29 17:02:45 +02:00
Dmitriy Zaporozhets 813e272896 Merge branch 'faster-branch-contains' into 'master' 
Faster branch contains detection for commit

Much faster then iterate over all branches in rugged and look for existing commit

See merge request !1129
 2014-09-29 14:53:54 +00:00
Dmitriy Zaporozhets 3dc9a67c2a Merge pull request #7898 from cirosantilli/hide-wrap-text-mr-binary 
Only show text wrap and diff notes for text in merge requests.
 2014-09-29 17:43:00 +03:00
Dmitriy Zaporozhets 88b1e0ffcd Faster branch contains detection for commit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 16:40:13 +03:00
Marin Jankovski fbc6f95a02 Protect default branch by default. 2014-09-29 15:12:07 +02:00
Ciro Santilli da4eff4add Only show text wrap and diff notes for text in MR. 2014-09-29 14:48:05 +02:00
Dmitriy Zaporozhets 44bc5fe5d6 Improve commits data loading on Tree page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 14:40:36 +03:00
Dmitriy Zaporozhets 376e004c16 Merge branch 'issue-box-redesign' into 'master' 
Issue box redesign

I complained before about the issue box looks. This is a proposed redesign.

The background of the issue is slightly lighter than the comments, so there is a clear distinction.

To make sure the issue then doesn't disappear, the shadow is slightly strongly (but still barely noticeable, to keep it flat).

The left top corner is round to highlight the status 'label', as it were a real label.

See merge request !1125
 2014-09-29 10:19:23 +00:00
Dmitriy Zaporozhets 91d30c9002 Merge branch 'refactor-graphs' into 'master' 
Improving graphs: add new commits graphs page

This MR adds new page to graphs sections with commits statistic

![Screenshot 2014-09-26 20.32.01](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/61fd84c4d6/Screenshot_2014-09-26_20.32.01.png)

See merge request !1124
 2014-09-29 10:16:17 +00:00
Dmitriy Zaporozhets 3a8cd1fa59 Refactor commits graph 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 12:05:17 +03:00
Job van der Voort be296633fd redesign issue box to look more soft 2014-09-28 21:23:21 +02:00
Dmitriy Zaporozhets 477214cdc6 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-28 17:50:15 +03:00
Dmitriy Zaporozhets 6d0ddf45ba Raw implementation of commits stats page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 20:32:44 +03:00
Dmitriy Zaporozhets 20e0c9b132 Rewrite graphs feature 
* remove commits stats page (will be replaced by graphs)
* remove additions/deletions from graph because of bad performance
* keep graph logic in gitlab

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 18:04:41 +03:00
Ciro Santilli 0cdef83dc8 Remove type submit from button_tag since default. 2014-09-26 16:52:36 +02:00
Dmitriy Zaporozhets fd338d6715 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-26 12:58:20 +03:00
Dmitriy Zaporozhets 8fae6ad75a Fix typo in push service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 12:45:41 +03:00
MarkPochert 1be7c25dce Update application.js.coffee 
The require jquery.turbolinks should be before the require turbolinks.

https://github.com/rails/turbolinks => "Add the gem to your project, then add the following line to your JavaScript manifest file, after jquery.js but before turbolinks.js"
 2014-09-26 10:17:26 +02:00
Dmitriy Zaporozhets a932e28ddd Fix worker error when remove branch 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 10:55:39 +03:00
Dmitriy Zaporozhets 87cf5b7055 Fix GitPush service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 10:46:48 +03:00
Dmitriy Zaporozhets fabe282873 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-26 09:11:22 +03:00
Dmitriy Zaporozhets 46ad546287 Merge branch 'imrpove-filter-dropdown' into 'master' 
Imrpove filter dropdown

Fixes #1617

See merge request !1120
 2014-09-26 06:10:35 +00:00
Robert Schilling 53f6f537b0 Fix spelling error on profile page 2014-09-26 01:48:17 +02:00
Dmitriy Zaporozhets 16d530b7b0 Sort projects in search autocomplete by amount of stars. Most popular go first 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 19:41:49 +03:00
Dmitriy Zaporozhets 810028f3f3 Dont show blocked users in assignee filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 19:05:27 +03:00
Dmitriy Zaporozhets d6f04ad831 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-25 18:57:53 +03:00
Dmitriy Zaporozhets 74d4031bbe Minor UI improvements 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 18:52:33 +03:00
Dmitriy Zaporozhets ae94f59bd5 Merge pull request #7803 from cirosantilli/rm-unused-mr-contributing 
Remove ununsed CONTRIBUTING link on edit MR form.
 2014-09-25 18:45:02 +03:00
Dmitriy Zaporozhets 5040dbfbf8 Merge branch 'improve-flash-message' into 'master' 
Improve flash message

* dont fadeout so user can read
* show inside content block so user can notice it

See merge request !1119
 2014-09-25 15:43:10 +00:00
Dmitriy Zaporozhets 8ebe769f26 Small improvements to code rendering for white highlight 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 18:40:27 +03:00
Dmitriy Zaporozhets 20d6f96928 Improve flash messages 
* dont fadeout so user can read
* show inside content block so user can notice it

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 18:00:21 +03:00
Dmitriy Zaporozhets 3a72af480d Merge branch 'use-more-rugged' into 'master' 
Make GitLab CE works with new gitlab_git

Recently we removed grit dependency from `gitlab_git` in favor of rugged.

This changes make GitLab works with new library.

See merge request !194
 2014-09-25 13:58:20 +00:00
Dmitriy Zaporozhets 619c81b488 Fix Commit stats and diff encoding issues 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 15:26:35 +03:00
Dmitriy Zaporozhets 3a106cbcd3 Fix graphs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 15:06:41 +03:00
Dmitriy Zaporozhets 4b65b0e0f5 Fix wiki 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 13:56:23 +03:00
Dmitriy Zaporozhets b13c1469a3 Rollback diff drop and set default commit id to HEAD 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 12:46:30 +03:00
Dmitriy Zaporozhets 3695ae185b Decorate commit parents 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 12:19:26 +03:00
Dmitriy Zaporozhets 64a2afd3a4 Fix creating new file via web editor 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-24 19:30:58 +03:00
Dmitriy Zaporozhets 184e0f8df1 Fix non-showing error message when edit file via web 2014-09-24 19:15:37 +03:00
Dmitriy Zaporozhets 0b7377d86e Merge pull request #7820 from skv-headless/move_blame_to_rugged 
blame with rugged
 2014-09-24 12:55:40 +03:00
Dmitriy Zaporozhets 79a4da907d Merge pull request #7816 from cirosantilli/factor-fork 
Factor fork button view.
 2014-09-24 12:41:16 +03:00
Dmitriy Zaporozhets f0c0edc2a6 Merge branch 'improve-protect-wording' into 'master' 
Improve protect wording

See merge request !1103
 2014-09-24 09:39:09 +00:00
skv a286f92050 blame with rugged 2014-09-24 11:35:13 +04:00
Ciro Santilli b5c0bdd7c9 Factor fork button view. 2014-09-23 21:16:27 +02:00
Dmitriy Zaporozhets d0e3ab5826 Merge branch 'api/improve-error-reporting' of https://github.com/jubianchi/gitlabhq into jubianchi-api/improve-error-reporting 2014-09-23 21:35:45 +03:00
Dmitriy Zaporozhets 3c9ea7f4a9 Merge pull request #7521 from hiroponz/fix-not-rendered-graph-edge 
Fix not rendered the network graph edges
 2014-09-23 21:33:50 +03:00
Dmitriy Zaporozhets 66955bba38 Merge pull request #7795 from cirosantilli/factor-notes-css 
Factor .add-diff-note active state.
 2014-09-23 21:31:56 +03:00
Dmitriy Zaporozhets 6e328d5590 Merge pull request #7793 from cirosantilli/replace-javascript 
Replace javascript:; links with buttons.
 2014-09-23 21:28:35 +03:00
Marin Jankovski e5fb2ad908 Merge branch 'search-wiki-keyword' into 'master' 
Prevent 500 error on search results if description contains relative link

Bug: If I add relative link to comment or description and search for it - I get 500 error on search page.

Reason for this is that we use `@repository` variable. But for pages like search it does not assigned.
In future we should avoid using such variables. Especially in markdown parser that can be used on different pages

Fixes #1601

See merge request !1111
 2014-09-23 15:55:14 +00:00