Commit Graph
9209 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 3315e89df6 Merge branch 'ui-fixes' into 'master'
Improve UI for last push widget and web editor

See merge request !1296
2015-09-15 11:11:18 +00:00
Dmitriy Zaporozhets 080a086d76 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-09-15 11:47:30 +02:00
Dmitriy Zaporozhets dacff8f014 Fix UI for web editor
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-15 11:17:22 +02:00
Dmitriy Zaporozhets a635e1a395 Fix last push widget
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-15 11:02:37 +02:00
Dmitriy Zaporozhets 558084f403 Improve project settings button on profile
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-15 09:54:42 +02:00
Stan Hu 81e741af24 Merge pull request #9138 from liyakun/master
add "replace" and "upload" functionality
2015-09-14 17:57:41 -07:00
liyakun e2ece2bc35 Add "Replace" and "Upload" features
Refactor upload and replace functionality

    Rename file and move CSS

    Fix typo

    Make dropzone a div

    Remove unnecessary file

    Change color of "upload existing one"

    Add missing changes
2015-09-15 02:12:56 +02:00
Dmitriy Zaporozhets b5c681c0c9 Add current_ref helper method
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-14 20:23:01 +02:00
Dmitriy Zaporozhets d3be65a811 Remove repeating titles on members and label pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-14 20:08:35 +02:00
Dmitriy Zaporozhets 0c8f07774c Add page titles to header for group and project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-14 19:46:58 +02:00
Dmitriy Zaporozhets b35d5a6a16 Merge branch 'public_profiles' into 'master'
Make all group public

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1219#

Internal issue - https://dev.gitlab.org/gitlab/gitlabhq/issues/1361

See merge request !1247
2015-09-14 15:28:42 +00:00
Dmitriy Zaporozhets c0c314c6bf Merge branch 'forked-repo-creation-async' into 'master'
Import forked repositories asynchronously to prevent large repositories from timing out

Preserve synchronous mode of adding a repository since some tasks (e.g. restore/check) require the former.

One side bug fix is that the `ProjectCacheWorker` is also run, updating the repository size and commit numbers properly. Previously all the values were set to 0 when a project were forked.

* Closes #2388
* Closes #2400

See merge request !1231
2015-09-14 14:56:13 +00:00
Drew Blessing 539f30ddcf Fix tooltip display in list views 2015-09-14 08:45:16 -05:00
Dmitriy Zaporozhets 3e97de838c Hide search panel for group page if you dont have access 2015-09-14 15:01:04 +02:00
Dmitriy Zaporozhets db197aa61a Fix tests and improve wording 2015-09-14 14:16:08 +02:00
Dmitriy Zaporozhets b8225324ef Hide group sidebar menu if user cant access it 2015-09-14 12:46:24 +02:00
Dmitriy Zaporozhets 1d2173819b Show activity/projects depends on access 2015-09-14 11:41:19 +02:00
Dmitriy Zaporozhets 4e1c6019c8 Allow access to group from root url 2015-09-14 11:16:54 +02:00
Dmitriy Zaporozhets 4c060074b7 Skip auth for group page but return auth for other group pages 2015-09-14 11:05:23 +02:00
Drew Blessing f07fabc1cd Keep add-diff-note button the same size on hover. Fixes #2497 2015-09-12 09:50:44 -05:00
Robert Schilling 001738e992 Improve english of error message 2015-09-12 14:01:01 +02:00
Dmitriy Zaporozhets 5fcfba2780 Merge branch 'dashboard-titles' into 'master'
Clean up overlap between dashboard and explore

- Clean up overlap between dashboard and explore. ... 5d785457
  - Split up SnippetsController into separate dashboard and explore sections.
  - Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
- Consistently case `Back to X` links. 260fcd45
- Link to help from signin page bottom. d92696d3
- Make Help accessible for guests. c258e977

cc @dzaporozhets

See merge request !1260
2015-09-11 14:36:56 +00:00
Stan Hu 9995f0806b Import forked repositories asynchronously to prevent large repositories from timing out
Use import_status to track async import status and give feedback to the user

Closes #2388
Closes #2400
2015-09-11 00:34:04 -07:00
Robert Speicher 19c0bf2723 Simplify syntax highlighting of new notes 2015-09-10 15:38:25 -04:00
Robert Speicher 4e54b82326 Apply syntax highlighting to Markdown previews 2015-09-10 15:38:24 -04:00
Robert Speicher 404a01ab14 Add specs for syntax_highlight JS
Also makes it work when given a parent element containing a
`.js-syntax-highlight` element so for dynamically-added things like
notes or Markdown previews, we can more accurately target just the
element we care about.
2015-09-10 15:38:24 -04:00
Dmitriy Zaporozhets 1c3c3ba512 Merge branch 'ui-improvements' into 'master'
UI improvements

* Convert forked from button to text
* Refactor md variables
* Improve project fork page
* Style blob show page
* Style syntax highlight area for white theme

See merge request !1273
2015-09-10 12:34:24 +00:00
Douwe Maan a6997e339b Merge branch 'master' into dashboard-titles 2015-09-10 13:13:01 +01:00
Dmitriy Zaporozhets 059b8828d3 Style syntax highlight area for white theme
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 13:36:42 +02:00
Dmitriy Zaporozhets b08c5521f5 Style blob show page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 13:25:09 +02:00
Dmitriy Zaporozhets df51b029ab Improve project fork page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 13:14:25 +02:00
Dmitriy Zaporozhets 6933da1ee0 Refactor md variables
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 12:38:07 +02:00
Dmitriy Zaporozhets 86ef2eb728 Conver forked from button to text
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 12:35:37 +02:00
Dmitriy Zaporozhets dadf6daac4 Merge branch 'disable-issue-autofill' into 'master'
Turned off autocomplete for new issue titles

See merge request !1271
2015-09-10 10:17:53 +00:00
Dmitriy Zaporozhets af3b6f6362 Fix fixed layout
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 09:52:02 +02:00
Dmitriy Zaporozhets a0359fbd77 Improve accounts page UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 00:34:09 +02:00
Darby def939a562 Turned off autocomplete for new issue titles 2015-09-09 15:04:38 -07:00
Dmitriy Zaporozhets 960a1880ab Fix last element of sidebar being hidden for small screens
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-09 23:49:34 +02:00
Dmitriy Zaporozhets 12ad9b4ba0 Enable blank container for group settings page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-09 23:38:27 +02:00
Dmitriy Zaporozhets 10b6a92481 Style panels and add blank container
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-09 23:29:19 +02:00
Dmitriy Zaporozhets 1e3ce07714 Use page title for header title too
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-09 23:05:47 +02:00
Dmitriy Zaporozhets fa40759768 Separate profile settings link from the rest on sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-09 22:36:13 +02:00
Dmitriy Zaporozhets 0d610270d9 Merge branch 'ui-improvements' into 'master'
Fix UI bugs with discussions

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

See merge request !1265
2015-09-09 09:47:48 +00:00
Dmitriy Zaporozhets c9d78a00c5 Fix UI bugs with discussions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-09 11:36:55 +02:00
Douwe Maan e8c8feb4b3 Merge branch 'add-meta-referrer-tag' into 'master'
Add meta tag for referrer

https://gitlab.zendesk.com/agent/tickets/7054

Added a meta referrer tag, so that only the origin is sent to third party sites, instead of the entire URL, thus avoiding the leak of sensitive information like password reset tokens.

/cc @DouweM

See merge request !1263
2015-09-09 08:59:26 +00:00
Dmitriy Zaporozhets b05cc8bc9a Merge branch 'global_labels' into 'master'
Global labels

https://dev.gitlab.org/gitlab/gitlabhq/issues/2353

See merge request !1240
2015-09-09 08:57:54 +00:00
Valery Sizov b7431ec042 Make all group public 2015-09-09 11:27:03 +03:00
Douwe Maan be59f4338f Fix RootController 2015-09-09 09:25:49 +01:00
Dmitriy Zaporozhets fbcde1aa77 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-09-09 09:20:48 +02:00
Jared Szechy e156f42079 FogBugz project import 2015-09-08 20:23:01 -04:00