home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,254 Commits 48 Branches 340 Tags
d76700a87f1c643d2603d008b2c67deddfeeafa3
Commit Graph
1044 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets b03b69e23e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/images/brand_logo.png
	app/assets/stylesheets/sections/login.scss
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/appearances_helper.rb
	app/views/layouts/devise.html.haml
 2014-07-16 12:39:45 +03:00
Dmitriy Zaporozhets be5b6db883 Refactor diff suppress logic and diff views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 18:28:21 +03:00
Dmitriy Zaporozhets 3dc347a369 Cleanup diff stats UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 16:05:56 +03:00
Dmitriy Zaporozhets 45623089e2 Refactor MR build process 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 15:34:06 +03:00
Marin Jankovski 207bc8a0e7 Branches without parent commit cannot be merged. 2014-07-14 11:06:14 +02:00
Dmitriy Zaporozhets 1218a5e630 Add html_escape to project description. auto_link set description to html_safe but! dont escape html :(. 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 00:07:20 +03:00
Dmitriy Zaporozhets a74b66cdee Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/group.rb
	app/models/project.rb
	features/steps/shared/project.rb
 2014-07-10 23:43:42 +03:00
Dmitriy Zaporozhets cff1758486 Show counters in sidebar filter in same way like we did for projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-10 17:54:31 +03:00
Dmitriy Zaporozhets 53a8d50b2b Prevent html injection on commits page by commit message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-10 11:09:00 +03:00
Marin Jankovski 6b121aa5a7 Move the links decision to helper. 2014-07-09 10:12:09 +02:00
Marin Jankovski 5d25f3d9b1 Differentiate between dirs, files and general code. 2014-07-09 10:12:08 +02:00
Marin Jankovski de22913501 Check if blob is requested. 2014-07-09 10:12:08 +02:00
Marin Jankovski 4e0afce6a7 Show browse file if we are browsing file history. 2014-07-09 10:12:08 +02:00
Dmitriy Zaporozhets 7bd9a702e3 Merge pull request #7222 from jhund/fix-5936 
Don't remove trailing newline when editing a file in web UI editor
 2014-07-08 09:43:23 +03:00
Marin Jankovski 5277ff98f0 No need for bold font in message. 2014-07-07 11:58:29 +02:00
Marin Jankovski cad2ea3de7 Message for the git hook. 2014-07-07 11:56:02 +02:00
Dmitriy Zaporozhets 078a4a7c4e Merge branch 'improve-ci-widget-ui' into 'master' 
Improve ci widget ui

See merge request !943
 2014-07-04 13:21:24 +00:00
Dmitriy Zaporozhets 8395b2784a Use normal font instead of strong for ci status widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-04 09:32:46 +03:00
Dmitriy Zaporozhets d390219c6f Dont show 'Remove source brnach' checkbox for fork 
Remove source button checkbox always try to remove branch in target
project. For fork source & target projects are differents - so we hide
checkbox from UI. After MR accepted you can easily remove branch with
'Remove branch' button that do remove branch call to valid project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-04 09:22:46 +03:00
Dmitriy Zaporozhets 3decd46269 Better UI for closed/reopen buttons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-02 20:05:36 +03:00
Marin Jankovski 815fbbbf91 Add title html option to issue and mr links in milestones to show title on hover. 2014-07-01 14:16:37 +02:00
Sytse Sijbrandij 2f962a40e8 Merge pull request #7170 from cirosantilli/add-trailing-newlines 
[minor-refactor] Add trailing newline to all text files.
 2014-06-30 09:41:06 +02:00
Dmitriy Zaporozhets 77c0793847 Merge branch 'add-other-to-sharing-to-make-this-clear' into 'master' 
Add other to sharing to make this clear

See my comments in https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/118
 2014-06-27 18:12:04 +00:00
Jo Hund df3c466e37 Don't remove trailing newline when editing a file in web UI editor: 
* populate ACE editor content via API instead of HTML element inner text (to preserve trailing whitespace).
* remove hack in EditTreeController#preview that replaces any removed \n.

Fixes #5936
 2014-06-27 10:50:36 -07:00
Sytse Sijbrandij b118e30e9d Fix spelling mistake. 2014-06-27 11:32:26 +02:00
Sytse Sijbrandij d4bb8094f3 Wording improvement to sharing with groups. 2014-06-27 11:20:27 +02:00
Dmitriy Zaporozhets e64343d6e1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/views/layouts/devise.html.haml
	features/project/project.feature
	features/steps/project/project.rb
 2014-06-26 13:02:08 +03:00
Sytse Sijbrandij 9ab3882510 Put a dash before the readme link so it doesn't look like it is part of the description. 2014-06-25 13:02:14 +02:00
Dmitriy Zaporozhets af7e77984c Show VERSION information on project sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-25 12:07:06 +03:00
Dmitriy Zaporozhets 674cbe1534 Fix diff comments toggle button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-25 11:40:33 +03:00
Dmitriy Zaporozhets 9a3cab6bf6 Cleanup 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 22:23:32 +03:00
Dmitriy Zaporozhets e93f6b030a Improve discussions 
* check for outdated discussions by comparing diff
* improve discussion UI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 22:19:35 +03:00
Dmitriy Zaporozhets 14bc7e0573 Show README link only if repository exists and not empty 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 16:15:10 +03:00
Dmitriy Zaporozhets a49d45db41 Move reply button to helper from view 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 13:34:46 +03:00
Dmitriy Zaporozhets 961217f87e Merge branch 'link-to-readme-from-description' into 'master' 
Link to readme from description

If you are viewing a repository for the first time you are likely to view the description. If you want to keep reading after that you can now click a link to the readme. This place is in addition to the README button at the bottom of the right hand menu that is harder to find. If you have edit rights only the description edit button is shown to ensure the text fits, the assumption is that the readme is most interesting for people not yet added to the project.
 2014-06-24 10:19:47 +00:00
Dmitriy Zaporozhets 094e5efb4c Merge pull request #6992 from skv-headless/project_commits_sql_optimization 
notes count in 1 query  for mr and commits
 2014-06-24 10:38:50 +03:00
Dmitriy Zaporozhets 6aa3e7ba0b Merge pull request #7169 from cirosantilli/remove-center-elem 
Replace HTML5 obsolete center element with CSS.
 2014-06-24 10:28:06 +03:00
Dmitriy Zaporozhets d25f2544fa Merge pull request #7177 from Totof6942/master 
Small ui fix
 2014-06-24 10:26:48 +03:00
Sytse Sijbrandij 7ed11fded5 Remove button code from readme link. 2014-06-24 08:43:55 +02:00
Sytse Sijbrandij 882c7b50b8 Allow for the readme not to exist. 2014-06-23 09:50:29 +02:00
Sytse Sijbrandij 9f36888b99 Link to readme from description if you don't have edit rights on the repository. 2014-06-23 09:16:38 +02:00
Dmitriy Zaporozhets 5b8c176767 Merge branch 'html-semantic' into 'master' 
Use html5 tags for better semantic
 2014-06-23 06:37:35 +00:00
Dmitriy Zaporozhets fe00d0f50d Merge branch 'mr-diff-loading-spinner' into 'master' 
MR diff loading spinner

When you click `Changes` tab if diff is big - you now see loading spinner
 2014-06-23 06:37:14 +00:00
Dmitriy Zaporozhets 860785a45e Merge branch 'skip_to_buttons_on_tab_in_issues_page' into 'master' 
Skip to buttons on tabbing in issues page

This will skip tabbing right to "Add comment" or "close" buttons.

http://www.w3.org/TR/html5/editing.html#sequential-focus-navigation-and-the-tabindex-attribute

For tabindex:

```
If the value is a negative integer
The user agent must set the element's tabindex focus flag, but should not allow the element to be reached using sequential focus navigation.
```
 2014-06-23 06:36:19 +00:00
Christophe Poulette 2d71780705 Small ui fix 2014-06-22 18:24:50 +02:00
Ciro Santilli a7e0ca9e83 Add trailing newline to all text files. 
Present in the large majority of files of each respective type.
 2014-06-21 11:20:22 +02:00
Ciro Santilli 83f4735b57 Replace HTML5 obsolete center element with CSS. 
Fix #6901. Would generate invalid HTML5.
 2014-06-21 09:43:00 +02:00
Dmitriy Zaporozhets 8401ec56e3 Show spinner when loading MR diff 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-20 12:17:06 +03:00
Marin Jankovski 484819063c Merge remote-tracking branch 'ce/master' 
Conflicts:
	VERSION
	doc/install/installation.md
 2014-06-19 09:22:51 +02:00
Marin Jankovski 8301557966 Add tabindex -1 to skip on tabbing. 2014-06-18 14:21:24 +02:00