Commit Graph
148 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 80b2f3fb86 Implement merge requests search
It is same search like we have at issues page. It allows to quickly
filter merge requests based on title or desription. I copy-pasted some
js code from Issues.js. In future search (filtering) logic should be
refactoed into one class for merge requests and issues
2015-03-12 16:20:58 -07:00
Dmitriy Zaporozhets 433b4c76fc Apply some styles from flatly theme 2015-03-07 00:28:53 -08:00
Dmitriy Zaporozhets 3bfd53149c Replace bs-callout with alert 2015-03-06 18:36:22 -08:00
Dmitriy Zaporozhets 38862308f0 Cache project row on dashboard, group and user page 2015-03-05 09:43:41 -08:00
Dmitriy Zaporozhets 65105ff3bb Improve projects list
* Add search filtering for group projects
* Show all user projects on dashboard
* Refactor projects list into one view
* Hide big list of projects with 'Show all' button
2015-03-04 17:22:55 -08:00
Dmitriy Zaporozhets 519ca7bae9 Merge branch 'link-to-button' of https://github.com/cirosantilli/gitlabhq into cirosantilli-link-to-button
Conflicts:
	app/views/shared/_issuable_filter.html.haml
2015-03-02 15:28:22 -08:00
Douwe MaanandMarin Jankovski c9829146f8 LDAP users don't need to set a password to Git over HTTP. 2015-02-23 20:04:18 -08:00
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
2015-02-19 20:53:05 -07:00
Dmitriy Zaporozhets 4511bc1f3d Prettify milestones page 2015-02-19 15:56:23 -08:00
Dmitriy Zaporozhets b876793d03 Restlye issueable filters to be more compact 2015-02-19 15:47:10 -08:00
Dmitriy Zaporozhets 904c382f6a Fix code rendering for snippets 2015-02-17 00:16:28 -08:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
Douwe Maan 25e44d0530 Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S). 2015-02-13 14:44:42 +01:00
Dmitriy Zaporozhets 8952fc015f Apply default scope to labels and remove one for notes 2015-02-05 20:29:41 -08:00
Dmitriy Zaporozhets bbca6a0abd Refactor sorting in project 2015-02-05 19:15:05 -08:00
Ciro Santilli 55d9809055 Convert Javascript links to buttons. 2015-01-17 19:50:41 +01:00
Hannes Rosenögger b0ec61500e Fixes the sort dropdown goind outside of the screen
see gitlab-org/gitlab-ce#986
2015-01-17 16:39:29 +01:00
Dmitriy Zaporozhets 4dfa1ed269 Add some mobile fixes to UI 2015-01-15 23:24:30 -08:00
Stefan Tatschner bf079c24af Replace highlight.js with rouge-fork rugments
I decided to create a fork of rouge as rouge lacks a HTML formatter with
the required options such as wrapping a line with <span> tags.
Furthermore I was not really convinced about the clarity of rouge's
source code.

Rugments 1.0.0beta3 for now only includes some basic linting and a new
HTML formatter. Everything else should behave the same.
2015-01-15 13:41:11 +01:00
Dmitriy Zaporozhets 4165426725 Restyle and refactor milestones filter 2015-01-06 12:32:04 -08:00
Dmitriy Zaporozhets 3d3c7e743f Merge branch 'check_browser_version' of https://github.com/vicvega/gitlabhq into vicvega-check_browser_version
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	app/assets/stylesheets/generic/common.scss
2014-12-28 22:13:31 +02:00
Dmitriy Zaporozhets a248efadf7 Fix links for no-ssh message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-26 14:28:49 +02:00
Dmitriy Zaporozhets f1c39763c9 Fix UI for no-ssh-key message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-26 14:25:37 +02:00
Francesco Coda Zabetta 84b40a346a check browser version, blacklisting outdated IE (version < 10) 2014-12-24 16:22:08 +01:00
Dmitriy Zaporozhets 5cf2bd4c99 Merge branch 'project-path' into 'master'
Project path

Fixes gitlab/gitlabhq#1781, gitlab/gitlabhq#1763

See merge request !1337
2014-12-24 13:27:26 +00:00
Dmitriy Zaporozhets 7b792af872 Improvements to issues/mr filters:
* use filter_params variable when set filter values
* fix project issues spinach tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-24 11:39:03 +02:00
Dmitriy Zaporozhets 47634e392f Refactor issues and merge requests lists
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-23 18:49:39 +02:00
Dmitriy Zaporozhets 32eb5de510 One column issue/mr lists for project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-23 17:31:38 +02:00
Dmitriy Zaporozhets 1f2628fe21 Allow Group path to be changed at the same time as name
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-22 15:02:47 +02:00
Dmitriy Zaporozhets ed2bcf952b Set group path during creation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-22 13:50:58 +02:00
Dmitriy Zaporozhets 06a219baa5 Restyle group page and event filter
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-16 18:15:48 +02:00
Dmitriy Zaporozhets d80a59c7b1 Create helper for sort drowdown option names
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-04 12:10:38 +02:00
Dmitriy Zaporozhets bf39347970 Merge branch 'larger-avatar'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-12-02 12:44:18 +02:00
Sytse Sijbrandij 8f60144782 Change avatar file size to 200kb. 2014-12-02 10:32:24 +01:00
Robert Schilling 86c55106a0 Change twitter handle from gitlabhq -> gitlab 2014-12-01 17:45:25 +01:00
Dmitriy Zaporozhets fb5c1dd8f0 Merge pull request #8113 from cirosantilli/factor-group-forms
Factor group forms
2014-10-21 11:39:41 +03:00
Robert Schilling 11656fd423 Merge pull request #8111 from cirosantilli/dry-group-avatar-button
Factor choose group avatar button
2014-10-21 08:25:09 +02:00
Ciro Santilli 3a47ed979a Factor group forms 2014-10-21 00:25:44 +02:00
Ciro Santilli 01db264ffc Factor choose group avatar button 2014-10-20 23:57:46 +02:00
Ciro Santilli f7d01f2067 Factor group tips 2014-10-20 23:43:51 +02:00
Valery Sizov 47f539f5a6 Snippets: public/internal/private 2014-10-09 17:09:53 +03:00
Dmitriy Zaporozhets 9021debf50 ConfirmDangerModal window added. It will be used for confirmation of dangerous actions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-08 13:56:57 +03:00
Sytse Sijbrandij 3fff9aa34f Merge pull request #7981 from cirosantilli/www-to-about
Replace www.gitlab.com with about.gitlab.com
2014-10-08 09:46:51 +02:00
Ciro Santilli 7dcbf35019 Replace www.gitlab.com with about.gitlab.com 2014-10-07 13:16:19 +02:00
Valery Sizov fd8d1d9b62 Snippets: rename public to internal 2014-10-07 11:54:00 +03:00
Dmitriy Zaporozhets 43217dd5dd Merge branch 'cirosantilli-factor-commit-msg-textarea'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/edit_tree/show.html.haml
2014-10-03 14:38:33 +03:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Ciro Santilli 3098e7a453 Factor commit message textareas. 2014-10-02 12:03:30 +02:00
Dmitriy Zaporozhets 4b65b0e0f5 Fix wiki
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-25 13:56:23 +03:00
Ben Bodenmiller 47171aab3d add requests link
Add requests link for feature requests.
2014-09-12 02:07:17 -07:00