home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,740 Commits 48 Branches 340 Tags
0ecc57fe50562bf2afede2e89d0bab69de89aebd
Commit Graph
18740 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marin Jankovski 0ecc57fe50 Merge branch 'update-gitlab-emoji' into 'master' 
Update gitlab_emoji to 0.1.1

See merge request !1290
 2015-09-15 13:47:43 +00:00
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 ff22868b90 Merge branch 'renasem-btn' into 'master' 
Improve project settings button on profile

Rename `Edit profile settings` to `profile settings` button

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

See merge request !1932
 2015-09-15 09:04:17 +00: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 c99473e57c Merge branch 'header-titles' into 'master' 
Add page titles to header for group and project

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

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2586

See merge request !1293
 2015-09-14 19:00:28 +00: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
Robert Schilling 0d01008876 Update gitlab_emoji to 0.1.1 2015-09-14 18:10:23 +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
Dmitriy Zaporozhets e72b9ffe98 Merge branch 'fix_tooltips' into 'master' 
Fix tooltip display in list views

After the recent UI changes the tooltips in a list view rendered behind the next object. This resets the tooltip's container to the body, rather than the individual `issue-info` div. In particular, this change will be applied to *all* tooltips in GitLab. This should take care of any other unidentified issues like this and should not have any negative effects that I can think of. This fixes the bug I noted in !1255.

**Current:**

![Screen_Shot_2015-09-14_at_8.45.34_AM](https://gitlab.com/dblessing/gitlab-ce/uploads/5fc6343f2e440dd10d01dfa595835e6a/Screen_Shot_2015-09-14_at_8.45.34_AM.png)

**As proposed:**

![Screen_Shot_2015-09-14_at_8.44.35_AM](https://gitlab.com/dblessing/gitlab-ce/uploads/7ffce7ce7523514bf7bb43d6380eb1d1/Screen_Shot_2015-09-14_at_8.44.35_AM.png)

See merge request !1288
 2015-09-14 14:47:19 +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 d3f5df2bba Merge branch 'add_diff_note_hover_size' into 'master' 
Keep add-diff-note button the same size on hover. Fixes #2497

Removes the overridden `font-size` and `width` so the button inherits size on hover. See #2497 for screenshots of prior behavior.

See merge request !1285
 2015-09-14 12:22:02 +00: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
Hannes Rosenögger 661e317229 Merge branch 'latest_tag_patch_release' into 'master' 
Add LATEST_TAG variable to automatically fetch the latest tag

Add LATEST_TAG variable to automatically fetch the latest tag

Replaces !1241

See merge request !1287
 2015-09-14 10:37:00 +00:00
Dmitriy Zaporozhets 66840f03cc Fix tests for group access 2015-09-14 12:15:11 +02:00
Dmitriy Zaporozhets 1d2173819b Show activity/projects depends on access 2015-09-14 11:41:19 +02:00
Dmitriy Zaporozhets 548d20e895 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-09-14 11:33:01 +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
Job van der Voort a2ca53c51d Merge branch 'issues-database' into 'master' 
added note about Issues stored in the database

Because of tweet https://twitter.com/galstar/status/637981324117020672


See merge request !1930
 2015-09-14 08:12:11 +00:00
Achilleas Pipinellis 0ced0ace28 Add LATEST_TAG variable 2015-09-14 09:54:38 +03:00
karen Carias 8e523f49a0 added note 2015-09-13 21:27:29 -07:00
Drew Blessing f07fabc1cd Keep add-diff-note button the same size on hover. Fixes #2497 2015-09-12 09:50:44 -05:00
Job van der Voort d6697bbd94 Merge branch 'improve-error-message' into 'master' 
Improve english of error message

See merge request !1284
 2015-09-12 12:59:57 +00: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
Douwe Maan 4f461fd45f Merge branch 'rs-fix-highlighting' into 'master' 
Syntax highlighting improvements

On the server side:

During development I would occasionally see SanitizationFilter sanitizing
the result of SyntaxHighlightFilter, even though its attributes were
whitelisted. This updates the `clean_spans` transformer to return the
whitelisted node as [suggested by the Sanitize docs](http://git.io/vZR8i).

On the client side:

- Makes the syntax_highlight JS more flexible
- Adds JS specs
- Simplifies highlighting of new notes
- Adds highlighting to Markdown preview

See merge request !1278
 2015-09-11 08:47:13 +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 a5bb85f8a2 Merge branch 'rescue-syntax-highlighting-errors-updated' into 'master' 
Add comments and clean up test for !1274

See merge request !1279
 2015-09-10 22:30:21 +00:00
Stan Hu 267687993a Add comments and clean up test for !1274 2015-09-10 14:24:10 -07:00
Robert Schilling 7904a751f4 Merge branch 'fix-rouge-warning-noise' into 'master' 
Bump rouge to 1.10.1 to remove warning noise and fix other syntax highlighting bugs

rouge warnings begone!

Closes #2128

Closes #2433

See merge request !1277
 2015-09-10 21:03:36 +00:00
Stan Hu e20529cec4 Bump rouge to 1.10.1 2015-09-10 13:38:43 -07:00
Robert Speicher e3c97ede96 RU-BO-COOOOOOOOP 2015-09-10 16:06:24 -04: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
Robert Speicher 7cbf5e4d18 Prevent result of SyntaxHighlightFilter being sanitized 2015-09-10 15:08:06 -04:00
Stan Hu 3223a2a5ae Bump rouge to 1.10 to remove warning noise and fix other syntax highlighting bugs 
Closes #2128

Closes #2433
 2015-09-10 11:51:48 -07:00
Robert Schilling b2f3d024c3 Merge branch 'fix-changelog' into 'master' 
Fix some CHANGELOG entries

Noticed a few things were off.

See merge request !1276
 2015-09-10 18:49:51 +00:00
Stan Hu 201f50b94f Fix some CHANGELOG entries 2015-09-10 11:45:46 -07:00
Robert Speicher 7abb744eb9 Merge branch 'rs-changelog' into 'master' 
Add missing 7.14.x CHANGELOG entries

[ci skip]

See merge request !1275
 2015-09-10 18:02:00 +00:00