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
25,795 Commits 48 Branches 340 Tags
720ef51bd97f478dba2d2c1b59df958dabd7500a
Commit Graph
622 Commits
Author SHA1 Message Date
Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 
# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb
 2016-03-21 23:22:21 +01:00
Felipe Artur 8d544645f0 Add specs and add visibility level to admin groups 2016-03-21 19:11:24 -03:00
Douwe Maan 19aa20d528 Fix more specs 2016-03-20 23:09:33 +01:00
Arinde Eniola 367818d293 change the css class has_tooltip to has-tooltip universally 2016-03-20 21:37:22 +01:00
Douwe Maan 2eb19ea3ea Merge branch 'master' into issue_12658 2016-03-20 14:57:25 +01:00
Douwe Maan 0ce7c1e494 Merge branch 'label-tooltip' into 'master' 
Add label description in tooltip to labels in issue index and sidebar

The tooltip can get quite big, but it’s so useful to inform people about what these labels mean
new

![Screen_Shot_2016-03-08_at_11.48.28](/uploads/894baaaa1f789c3a2069a924d541e64b/Screen_Shot_2016-03-08_at_11.48.28.png)

![Screen_Shot_2016-03-08_at_11.48.20](/uploads/efe4fa0960054c4071b8f6bf83024403/Screen_Shot_2016-03-08_at_11.48.20.png)

@JobV writes on Slack:
> yeah I think it’s better than not, but I’d have to try it 😃 
> 
> cautious yes, revert if it’s annoying 😉

See merge request !3124
 2016-03-19 18:55:12 +00:00
Douwe MaanandRobert Speicher 738812240c Add label description in tooltip to labels in issue index and sidebar 2016-03-16 23:02:52 -04:00
Felipe Artur 44c127447b Merge 4009-external-users into issue_12658 2016-03-16 20:16:42 -03:00
Zeger-Jan van de Weg 59064aeeef Merge branch 'master' into 4009-external-users 2016-03-15 19:16:16 +01:00
Robert Speicher c4b35a6230 Merge branch 'fix-commit-status-rendering' into 'master' 
Cleanup Ci::Commit, Ci::Build and CommitStatus views

This MR tries to do first sweep of cleanups to Ci::Commit and
Ci::Build objects removing all view-related functions and fixing the
API from other side.

Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/6046

See merge request !2760
 2016-03-15 00:51:43 +00:00
Zeger-Jan van de Weg ab418e27a9 Improve external users feature 2016-03-14 22:06:23 +01:00
Zeger-Jan van de Weg 88f8d3a4d6 Merge branch 'master' into 4009-external-users 2016-03-14 20:08:02 +01:00
Kamil Trzcinski 0672258915 Cleanup CiCommit and CiBuild 
- Remove all view related methods from Ci::Build and CommitStatus
- Remove unused Ci::Commit and Ci::Build methods
- Use polymorphism to render different types of CommitStatus
 2016-03-14 13:20:35 +01:00
Zeger-Jan van de Weg 76eeb316df Create an external users tab on Admin user list 
Also incorporates the review into this, mainly spec changes.
 2016-03-13 19:10:33 +01:00
Zeger-Jan van de Weg 42fcd3881f External Users 
The user has the rights of a public user execpt it can never create a project,
 group, or team. Also it cant view internal projects.
 2016-03-13 19:08:04 +01:00
Dmitriy Zaporozhets 068fd5de8a Add finders logic and tests for shared projects feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-11 18:55:17 +01:00
Felipe Artur c3e70280df Prevent projects to have higher visibility than groups 
Prevent Groups to have smaller visibility than projects
Add default_group_visibility_level to configuration
Code improvements
 2016-03-10 10:38:36 -03:00
Robert Speicher 518dd9347b Improve consistency of SSH Keys title in administration area 2016-03-03 16:14:00 -05:00
Robert Speicher 76ed2afcfc Change js-quick-submit behavior to expect the class on the form 
Now it will work on any field inside that form, and it's easier to scope
new behavior, which is what we're adding next!
 2016-03-02 15:11:15 -05:00
Zeger-Jan van de Weg 9a2869ab46 Branded login page also in CE 
The only major difference with the EE version is the change from a light and dark logo to only a header logo
The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it
 2016-02-26 15:50:51 +01:00
Tap 2e81b1558b Label description and Label row 
- Add label description
- Show label row when filtering issues or merge requests by label
 2016-02-17 21:52:12 +08:00
Robert Speicher 7ea60fbfc8 Merge remote-tracking branch 'dev/master' into 'master' 2016-02-09 12:13:58 -05:00
Jason LeeandRémy Coutable 9474e36f46 Add option to include the sender name in body of Notify email. fix #7824 2016-02-09 12:58:13 +01:00
Robert Speicher 89b3ddd609 Allow limited Markdown in Broadcast Messages 
Closes #11853
 2016-02-06 14:30:07 -05:00
Kamil Trzcinski 0806476761 Remove current_user && when can? is used 2016-02-05 20:17:58 +01:00
Kamil Trzcinski 170ca8435a Merge branch 'master' into ci-permissions 
# Conflicts:
#	db/schema.rb
 2016-02-05 20:15:32 +01:00
Dmitriy Zaporozhets 989caaebdc Improve admin broadcast messages page 
* Show latest broadcast messages first on admin page
* Use nice looking pagination

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-05 16:01:10 +01:00
Dmitriy Zaporozhets eaad236b45 Remove project-issuable-filter from admin builds page :) 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-05 11:53:06 +01:00
Dmitriy Zaporozhets dfe12649f6 Merge remote-tracking branch 'origin/rs-database-info' 2016-02-04 16:42:22 +01:00
Kamil Trzcinski 6fea7c386f Merge remote-tracking branch 'origin/master' into ci-permissions 
# Conflicts:
#	app/views/projects/builds/index.html.haml
 2016-02-04 13:16:48 +01:00
Robert Speicher 4105f292e1 Display database type and version in Administration dashboard 
Closes #12900
 2016-02-02 17:59:09 -05:00
Douglas Barbosa Alexandre 718b1dddfe Refactor Admin::SpamLogsController to block user before destroying 2016-02-02 11:25:44 -02:00
Douglas Barbosa Alexandre 62cad887ea Use time_ago_with_tooltip on spam logs list 2016-02-02 11:25:44 -02:00
Douglas Barbosa Alexandre 64c9768bd6 Use truncate helper on spam logs list 2016-02-02 11:25:44 -02:00
Stan HuandDouglas Barbosa Alexandre d20e75a8d8 Support Akismet spam checking for creation of issues via API 
Currently any spam detected by Akismet by non-members via API will be logged
in a separate table in the admin page.

Closes #5612
 2016-02-02 11:25:44 -02:00
Kamil Trzcinski 055afab5c7 Make the CI permission model simpler 
This MR simplifies CI permission model:
- read_build: allows to read a list of builds, artifacts and trace
- update_build: allows to cancel and retry builds
- create_build: allows to create builds from gitlab-ci.yml (not yet implemented)
- admin_build: allows to manage triggers, runners and variables
- read_commit_status: allows to read a list of commit statuses (including the overall of builds)
- create_commit_status: allows to create a new commit status using API

Remove all extra methods to manage permission.
Made all controllers to use explicitly the new permissions.
 2016-02-02 09:18:08 +01:00
Robert Speicher 3986f4f083 Make "Two-factor" casing consistent throughout the application 2016-01-31 20:34:51 -05:00
Robert Speicher ca05054ea2 Partially revert "Add IP check against DNSBLs at account sign-up" 
This partially reverts 6a5cd3ca - we keep the migration and add a new
migration that reverts it in order to keep migration history intact.
 2016-01-28 16:28:19 -05:00
Phil Hughes 22e81f5dbe Removed sorted text from dropdowns 
Closes #12796
 2016-01-28 09:06:20 +00:00
Dmitriy Zaporozhets 48b6b0a446 Merge branch 'rs-issue-12672' into 'master' 
Remove link from system hook

Closes #12672

See merge request !2588
 2016-01-27 18:45:51 +00:00
Zeger-Jan van de Weg c10296f92d Fix visibility level texts on application settings 
Introduced by me through !2005
 2016-01-26 14:54:35 +01:00
Zeger-Jan van de Weg 89154880e5 Save button on app settings now btn-save 2016-01-26 10:05:28 +01:00
Robert Speicher 0ae588255c Remove link from system hook 
Closes #12672
 2016-01-24 15:27:50 -08:00
Dmitriy Zaporozhets cf673ba9f6 Fix UI for pages with panels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-22 13:37:40 -08:00
Robert Speicher 1553c560e0 Merge branch 'feature/check-against-rbl-only' into 'master' 
Split from !2455

References #9092

See merge request !2515
 2016-01-20 14:24:20 -05:00
Douwe Maan 7838c957c2 Target '_blank' 2016-01-20 16:18:42 +01:00
Tomasz Maczukin 8536e083f7 Add IP blocking against DNSBL at sign-up 2016-01-20 15:28:19 +01:00
Jeroen Nijhof 7a609858f0 Use sentry in env production only 2016-01-20 09:48:38 +01:00
Jeroen Nijhof 85e0fce9ee Add sentry integration 2016-01-18 17:15:10 +01:00
Dmitriy Zaporozhets 620d8b68a1 Merge branch 'remove-gray-bg' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-14 14:09:49 +01:00